add committer

Fix conflicts

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,
 )

api/client/event/event_stream.go

@@ -14,22 +14,10 @@ import (
 )
 
 const (
-	EventHead                        = "head"
-	EventBlock                       = "block"
-	EventAttestation                 = "attestation"
-	EventVoluntaryExit               = "voluntary_exit"
-	EventBlsToExecutionChange        = "bls_to_execution_change"
-	EventProposerSlashing            = "proposer_slashing"
-	EventAttesterSlashing            = "attester_slashing"
-	EventFinalizedCheckpoint         = "finalized_checkpoint"
-	EventChainReorg                  = "chain_reorg"
-	EventContributionAndProof        = "contribution_and_proof"
-	EventLightClientFinalityUpdate   = "light_client_finality_update"
-	EventLightClientOptimisticUpdate = "light_client_optimistic_update"
-	EventPayloadAttributes           = "payload_attributes"
-	EventBlobSidecar                 = "blob_sidecar"
-	EventError                       = "error"
-	EventConnectionError             = "connection_error"
+	EventHead = "head"
+
+	EventError           = "error"
+	EventConnectionError = "connection_error"
 )
 
 var (

beacon-chain/core/blocks/payload.go

@@ -12,7 +12,6 @@ import (
 	"github.com/OffchainLabs/prysm/v6/consensus-types/blocks"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/interfaces"
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
-	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
 	"github.com/OffchainLabs/prysm/v6/runtime/version"
 	"github.com/OffchainLabs/prysm/v6/time/slots"
 	"github.com/pkg/errors"
@@ -240,16 +239,3 @@ func verifyBlobCommitmentCount(slot primitives.Slot, body interfaces.ReadOnlyBea
 	}
 	return nil
 }
-
-// GetBlockPayloadHash returns the hash of the execution payload of the block
-func GetBlockPayloadHash(blk interfaces.ReadOnlyBeaconBlock) ([32]byte, error) {
-	var payloadHash [32]byte
-	if IsPreBellatrixVersion(blk.Version()) {
-		return payloadHash, nil
-	}
-	payload, err := blk.Body().Execution()
-	if err != nil {
-		return payloadHash, err
-	}
-	return bytesutil.ToBytes32(payload.BlockHash()), nil
-}

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/error.go

@@ -16,9 +16,6 @@ var ErrNotFoundOriginBlockRoot = errors.Wrap(ErrNotFound, "OriginBlockRoot")
 // ErrNotFoundGenesisBlockRoot means no genesis block root was found, indicating the db was not initialized with genesis
 var ErrNotFoundGenesisBlockRoot = errors.Wrap(ErrNotFound, "OriginGenesisRoot")
 
-// ErrNotFoundBackfillBlockRoot is an error specifically for the origin block root getter
-var ErrNotFoundBackfillBlockRoot = errors.Wrap(ErrNotFound, "BackfillBlockRoot")
-
 // ErrNotFoundFeeRecipient is a not found error specifically for the fee recipient getter
 var ErrNotFoundFeeRecipient = errors.Wrap(ErrNotFound, "fee recipient")
 

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/eth/shared/testing/json.go

@@ -678,187 +678,6 @@ const (
   "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
 }`
 
-	// BadBlindedBellatrixBlock contains wrong data to create a block that does not pass ToConsensus conversion
-	// "parent_root" length too short
-	// "block_hash" length too short
-	// "state_root" length too short
-	BadBlindedBellatrixBlock = `{
-  "message": {
-    "slot": "1",
-    "proposer_index": "1",
-    "parent_root": "0xcf8e0d4e95872", 
-    "state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-    "body": {
-      "randao_reveal": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505",
-      "eth1_data": {
-        "deposit_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "deposit_count": "1",
-        "block_hash": "0xcf8e0d4e95872" 
-      },
-      "graffiti": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-      "proposer_slashings": [
-        {
-          "signed_header_1": {
-            "message": {
-              "slot": "1",
-              "proposer_index": "1",
-              "parent_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "state_root": "0xcf8e0d4e9580f2", 
-              "body_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-            },
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-          },
-          "signed_header_2": {
-            "message": {
-              "slot": "1",
-              "proposer_index": "1",
-              "parent_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "body_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-            },
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-          }
-        }
-      ],
-      "attester_slashings": [
-        {
-          "attestation_1": {
-            "attesting_indices": [
-              "1"
-            ],
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505",
-            "data": {
-              "slot": "1",
-              "index": "1",
-              "beacon_block_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "source": {
-                "epoch": "1",
-                "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-              },
-              "target": {
-                "epoch": "1",
-                "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-              }
-            }
-          },
-          "attestation_2": {
-            "attesting_indices": [
-              "1"
-            ],
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505",
-            "data": {
-              "slot": "1",
-              "index": "1",
-              "beacon_block_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "source": {
-                "epoch": "1",
-                "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-              },
-              "target": {
-                "epoch": "1",
-                "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-              }
-            }
-          }
-        }
-      ],
-      "attestations": [
-        {
-          "aggregation_bits": "0xffffffffffffffffffffffffffffffffff3f",
-          "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505",
-          "data": {
-            "slot": "1",
-            "index": "1",
-            "beacon_block_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "source": {
-              "epoch": "1",
-              "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-            },
-            "target": {
-              "epoch": "1",
-              "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-            }
-          }
-        }
-      ],
-      "deposits": [
-        {
-          "proof": [
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-			"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-          ],
-          "data": {
-            "pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a",
-            "withdrawal_credentials": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "amount": "1",
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-          }
-        }
-      ],
-      "voluntary_exits": [
-        {
-          "message": {
-            "epoch": "1",
-            "validator_index": "1"
-          },
-          "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-        }
-      ],
-      "sync_aggregate": {
-        "sync_committee_bits": "0x6451e9f951ebf05edc01de67e593484b672877054f055903ff0df1a1a945cf30ca26bb4d4b154f94a1bc776bcf5d0efb3603e1f9b8ee2499ccdcfe2a18cef458",
-        "sync_committee_signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-      },
-      "execution_payload_header": {
-        "parent_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "fee_recipient": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
-        "state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "receipts_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "prev_randao": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "block_number": "1",
-        "gas_limit": "1",
-        "gas_used": "1",
-        "timestamp": "1",
-        "extra_data": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "base_fee_per_gas": "1",
-        "block_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "transactions_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-      }
-    }
-  },
-  "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-}`
 	CapellaBlock = `{
   "message": {
     "slot": "1",
@@ -1056,208 +875,7 @@ const (
   },
   "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
 }`
-	// BadCapellaBlock contains wrong data to create a block that does not pass ToConsensus conversion
-	// "state_root" length too short
-	// "block_hash" length too short
-	// "graffiti" length too short
-	// "state_root" length too short
-	BadCapellaBlock = `{
-  "message": {
-    "slot": "1",
-    "proposer_index": "1",
-    "parent_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-    "state_root": "0xcf8e0d4e957e8208d920f2",
-    "body": {
-      "randao_reveal": "0x1b66ac1fb663c9baf888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505",
-      "eth1_data": {
-        "deposit_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "deposit_count": "1",
-        "block_hash": "0xcf8e0d4e95873691884560367e8208d920f2"
-      },
-      "graffiti": "0xcf8e0d4e9587369b230120f2",
-      "proposer_slashings": [
-        {
-          "signed_header_1": {
-            "message": {
-              "slot": "1",
-              "proposer_index": "1",
-              "parent_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "state_root": "0xcf8e0d4e9587369b2301d208d920f2",
-              "body_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-            },
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-          },
-          "signed_header_2": {
-            "message": {
-              "slot": "1",
-              "proposer_index": "1",
-              "parent_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "body_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-            },
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-          }
-        }
-      ],
-      "attester_slashings": [
-        {
-          "attestation_1": {
-            "attesting_indices": [
-              "1"
-            ],
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505",
-            "data": {
-              "slot": "1",
-              "index": "1",
-              "beacon_block_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "source": {
-                "epoch": "1",
-                "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-              },
-              "target": {
-                "epoch": "1",
-                "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-              }
-            }
-          },
-          "attestation_2": {
-            "attesting_indices": [
-              "1"
-            ],
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505",
-            "data": {
-              "slot": "1",
-              "index": "1",
-              "beacon_block_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-              "source": {
-                "epoch": "1",
-                "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-              },
-              "target": {
-                "epoch": "1",
-                "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-              }
-            }
-          }
-        }
-      ],
-      "attestations": [
-        {
-          "aggregation_bits": "0xffffffffffffffffffffffffffffffffff3f",
-          "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505",
-          "data": {
-            "slot": "1",
-            "index": "1",
-            "beacon_block_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "source": {
-              "epoch": "1",
-              "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-            },
-            "target": {
-              "epoch": "1",
-              "root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-            }
-          }
-        }
-      ],
-      "deposits": [
-        {
-          "proof": [
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-			"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
-          ],
-          "data": {
-            "pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a",
-            "withdrawal_credentials": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-            "amount": "1",
-            "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-          }
-        }
-      ],
-      "voluntary_exits": [
-        {
-          "message": {
-            "epoch": "1",
-            "validator_index": "1"
-          },
-          "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-        }
-      ],
-      "sync_aggregate": {
-        "sync_committee_bits": "0x6451e9f951ebf05edc01de67e593484b672877054f055903ff0df1a1a945cf30ca26bb4d4b154f94a1bc776bcf5d0efb3603e1f9b8ee2499ccdcfe2a18cef458",
-        "sync_committee_signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-      },
-      "execution_payload": {
-        "parent_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "fee_recipient": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
-        "state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "receipts_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "prev_randao": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "block_number": "1",
-        "gas_limit": "1",
-        "gas_used": "1",
-        "timestamp": "1",
-        "extra_data": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "base_fee_per_gas": "14074904626401341155369551180448584754667373453244490859944217516317499064576",
-        "block_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
-        "transactions": [
-          "0x02f878831469668303f51d843b9ac9f9843b9aca0082520894c93269b73096998db66be0441e836d873535cb9c8894a19041886f000080c001a031cc29234036afbf9a1fb9476b463367cb1f957ac0b919b69bbc798436e604aaa018c4e9c3914eb27aadd0b91e10b18655739fcf8c1fc398763a9f1beecb8ddc86"
-        ],
-        "withdrawals": [
-          {
-            "index": "1",
-            "validator_index": "1",
-            "address": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
-            "amount": "1"
-          }
-        ]
-      },
-      "bls_to_execution_changes": [
-        {
-          "message": {
-            "validator_index": "1",
-            "from_bls_pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a",
-            "to_execution_address": "0xabcf8e0d4e9587369b2301d0790347320302cc09"
-          },
-          "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-        }
-      ]
-    }
-  },
-  "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
-}`
+
 	BlindedCapellaBlock = `{
   "message": {
     "slot": "1",

beacon-chain/sync/rlnc/BUILD.bazel

@@ -0,0 +1,22 @@
+load("@prysm//tools/go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["committer.go"],
+    importpath = "github.com/OffchainLabs/prysm/v6/beacon-chain/sync/rlnc",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//crypto/rand:go_default_library",
+        "@com_github_gtank_ristretto255//:go_default_library",
+    ],
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = ["committer_test.go"],
+    embed = [":go_default_library"],
+    deps = [
+        "//testing/require:go_default_library",
+        "@com_github_gtank_ristretto255//:go_default_library",
+    ],
+)

beacon-chain/sync/rlnc/committer.go

@@ -0,0 +1,37 @@
+package rlnc
+
+import (
+	"errors"
+
+	"github.com/OffchainLabs/prysm/v6/crypto/rand"
+	ristretto "github.com/gtank/ristretto255"
+)
+
+// committer is a structure that holds the Ristretto generators.
+type committer struct {
+	generators []*ristretto.Element
+}
+
+// newCommitter creates a new committer with the number of generators.
+// TODO: read the generators from the config file.
+func newCommitter(n uint) *committer {
+	generators := make([]*ristretto.Element, n)
+	randomBytes := make([]byte, 64)
+	for i := range generators {
+		_, err := rand.NewGenerator().Read(randomBytes)
+		if err != nil {
+			return nil
+		}
+		generators[i] = &ristretto.Element{}
+		generators[i].FromUniformBytes(randomBytes)
+	}
+	return &committer{generators}
+}
+
+func (c *committer) commit(scalars []*ristretto.Scalar) (*ristretto.Element, error) {
+	if len(scalars) > len(c.generators) {
+		return nil, errors.New("too many scalars")
+	}
+	result := &ristretto.Element{}
+	return result.VarTimeMultiScalarMult(scalars, c.generators), nil
+}

beacon-chain/sync/rlnc/committer_test.go

@@ -0,0 +1,40 @@
+package rlnc
+
+import (
+	"crypto/rand"
+	"testing"
+
+	"github.com/OffchainLabs/prysm/v6/testing/require"
+	ristretto "github.com/gtank/ristretto255"
+)
+
+func TestCommit(t *testing.T) {
+	n := 5
+	c := newCommitter(uint(n))
+	require.NotNil(t, c)
+	require.Equal(t, n, len(c.generators))
+
+	scalars := make([]*ristretto.Scalar, n)
+	randomBytes := make([]byte, 64)
+	for i := range scalars {
+		_, err := rand.Read(randomBytes)
+		require.NoError(t, err)
+		scalars[i] = &ristretto.Scalar{}
+		scalars[i].FromUniformBytes(randomBytes)
+	}
+
+	msm := &ristretto.Element{}
+	msm.VarTimeMultiScalarMult(scalars, c.generators)
+
+	expected := ristretto.NewElement()
+	summand := &ristretto.Element{}
+	for i, scalar := range scalars {
+		summand.ScalarMult(scalar, c.generators[i])
+		expected.Add(expected, summand)
+	}
+	require.Equal(t, 1, expected.Equal(msm))
+
+	committment, err := c.commit(scalars)
+	require.NoError(t, err)
+	require.Equal(t, 1, committment.Equal(msm))
+}

changelog/potuz_hdiff_diff_type.md

@@ -1,3 +0,0 @@
-### Added
-
-- Add native state diff type and marshalling functions

changelog/potuz_remove_unused_fieldparams.md

@@ -0,0 +1,3 @@
+### Ignored
+
+- Removed unusued fieldparams

changelog/tt_sandwich.md

@@ -0,0 +1,3 @@
+### Ignored
+
+- Remove unused.

changelog/tt_udon.md

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

config/fieldparams/mainnet.go

@@ -40,17 +40,7 @@ const (
 	PendingDepositsLimit                  = 134217728         // Maximum number of pending balance deposits in the beacon state.
 	PendingPartialWithdrawalsLimit        = 134217728         // Maximum number of pending partial withdrawals in the beacon state.
 	PendingConsolidationsLimit            = 262144            // Maximum number of pending consolidations in the beacon state.
-	MaxDepositRequestsPerPayload          = 8192              // Maximum number of deposit requests in an execution payload.
-	MaxWithdrawalRequestsPerPayload       = 16                // Maximum number of execution layer withdrawal requests in an execution payload.
-	MaxConsolidationRequestsPerPayload    = 1                 // Maximum number of consolidation requests in an execution payload.
-	MaxProposerSlashings                  = 16                // Maximum number of proposer slashings in a block.
-	MaxAttesterSlashings                  = 2                 // Maximum number of attester slashings in a block.
 	MaxAttesterSlashingsElectra           = 1                 // Maximum number of attester slashings in a block.
-	MaxAttestations                       = 128               // Maximum number of attestations in a block.
-	MaxAttestationsElectra                = 8                 // Maximum number of attestations in a block.
-	MaxDeposits                           = 16                // Maximum number of deposits in a block.
-	MaxVoluntaryExits                     = 16                // Maximum number of voluntary exits in a block.
-	MaxBlsToExecutionChanges              = 16                // Maximum number of bls to execution changes in a block.
 	MaxRandomByte                         = uint64(1<<8 - 1)  // MaxRandomByte defines max for a random byte using for proposer and sync committee sampling.
 	MaxRandomValueElectra                 = uint64(1<<16 - 1) // MaxRandomValueElectra defines max for a random value using for proposer and sync committee sampling.
 )

config/fieldparams/minimal.go

@@ -40,17 +40,7 @@ const (
 	PendingDepositsLimit                  = 134217728         // Maximum number of pending balance deposits in the beacon state.
 	PendingPartialWithdrawalsLimit        = 64                // Maximum number of pending partial withdrawals in the beacon state.
 	PendingConsolidationsLimit            = 64                // Maximum number of pending consolidations in the beacon state.
-	MaxDepositRequestsPerPayload          = 4                 // Maximum number of deposit requests in an execution payload.
-	MaxWithdrawalRequestsPerPayload       = 2                 // Maximum number of execution layer withdrawal requests in an execution payload.
-	MaxConsolidationRequestsPerPayload    = 1                 // Maximum number of consolidation requests in an execution payload.
-	MaxProposerSlashings                  = 16                // Maximum number of proposer slashings in a block.
-	MaxAttesterSlashings                  = 2                 // Maximum number of attester slashings in a block.
 	MaxAttesterSlashingsElectra           = 1                 // Maximum number of attester slashings in a block.
-	MaxAttestations                       = 128               // Maximum number of attestations in a block.
-	MaxAttestationsElectra                = 8                 // Maximum number of attestations in a block.
-	MaxDeposits                           = 16                // Maximum number of deposits in a block.
-	MaxVoluntaryExits                     = 16                // Maximum number of voluntary exits in a block.
-	MaxBlsToExecutionChanges              = 16                // Maximum number of bls to execution changes in a block.
 	MaxRandomByte                         = uint64(1<<8 - 1)  // Maximum value for a random value using for proposer and sync committee sampling.
 	MaxRandomValueElectra                 = uint64(1<<16 - 1) // Maximum value for a random value using for proposer and sync committee sampling.
 )

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
-}

consensus-types/blocks/execution.go

@@ -40,12 +40,6 @@ func NewWrappedExecutionData(v proto.Message) (interfaces.ExecutionData, error)
 	case *enginev1.ExecutionBundleElectra:
 		// note: no payload changes in electra so using deneb
 		return WrappedExecutionPayloadDeneb(pbStruct.Payload)
-	case *enginev1.ExecutionPayloadHeader:
-		return WrappedExecutionPayloadHeader(pbStruct)
-	case *enginev1.ExecutionPayloadHeaderCapella:
-		return WrappedExecutionPayloadHeaderCapella(pbStruct)
-	case *enginev1.ExecutionPayloadHeaderDeneb:
-		return WrappedExecutionPayloadHeaderDeneb(pbStruct)
 	default:
 		return nil, ErrUnsupportedVersion
 	}

consensus-types/blocks/proofs.go

@@ -18,7 +18,6 @@ import (
 
 const (
 	payloadFieldIndex = 9
-	bodyFieldIndex    = 4
 )
 
 func ComputeBlockBodyFieldRoots(ctx context.Context, blockBody *BeaconBlockBody) ([][]byte, error) {
@@ -196,45 +195,6 @@ func ComputeBlockBodyFieldRoots(ctx context.Context, blockBody *BeaconBlockBody)
 	return fieldRoots, nil
 }
 
-func ComputeBlockFieldRoots(ctx context.Context, block interfaces.ReadOnlyBeaconBlock) ([][]byte, error) {
-	_, span := trace.StartSpan(ctx, "blocks.ComputeBlockFieldRoots")
-	defer span.End()
-
-	if block == nil {
-		return nil, errNilBlock
-	}
-
-	fieldRoots := make([][]byte, 5)
-	for i := range fieldRoots {
-		fieldRoots[i] = make([]byte, 32)
-	}
-
-	// Slot
-	slotRoot := ssz.Uint64Root(uint64(block.Slot()))
-	copy(fieldRoots[0], slotRoot[:])
-
-	// Proposer Index
-	proposerRoot := ssz.Uint64Root(uint64(block.ProposerIndex()))
-	copy(fieldRoots[1], proposerRoot[:])
-
-	// Parent Root
-	parentRoot := block.ParentRoot()
-	copy(fieldRoots[2], parentRoot[:])
-
-	// State Root
-	stateRoot := block.StateRoot()
-	copy(fieldRoots[3], stateRoot[:])
-
-	// block body Root
-	blockBodyRoot, err := block.Body().HashTreeRoot()
-	if err != nil {
-		return nil, err
-	}
-	copy(fieldRoots[4], blockBodyRoot[:])
-
-	return fieldRoots, nil
-}
-
 func PayloadProof(ctx context.Context, block interfaces.ReadOnlyBeaconBlock) ([][]byte, error) {
 	i := block.Body()
 	blockBody, ok := i.(*BeaconBlockBody)

consensus-types/hdiff/BUILD.bazel

@@ -1,33 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["state_diff.go"],
-    importpath = "github.com/OffchainLabs/prysm/v6/consensus-types/hdiff",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//beacon-chain/state:go_default_library",
-        "//config/fieldparams:go_default_library",
-        "//consensus-types/blocks:go_default_library",
-        "//consensus-types/helpers:go_default_library",
-        "//consensus-types/interfaces:go_default_library",
-        "//consensus-types/primitives:go_default_library",
-        "//proto/engine/v1:go_default_library",
-        "//proto/prysm/v1alpha1:go_default_library",
-        "//runtime/version:go_default_library",
-        "@com_github_pkg_errors//:go_default_library",
-        "@com_github_prysmaticlabs_fastssz//:go_default_library",
-        "@com_github_sirupsen_logrus//:go_default_library",
-        "@org_golang_google_protobuf//proto:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["state_diff_test.go"],
-    embed = [":go_default_library"],
-    deps = [
-        "//testing/require:go_default_library",
-        "//testing/util:go_default_library",
-    ],
-)

consensus-types/hdiff/state_diff_test.go

@@ -1,60 +0,0 @@
-package hdiff
-
-import (
-	"testing"
-
-	"github.com/OffchainLabs/prysm/v6/testing/require"
-	"github.com/OffchainLabs/prysm/v6/testing/util"
-)
-
-func Test_diffToState(t *testing.T) {
-	source, _ := util.DeterministicGenesisStateElectra(t, 256)
-	target := source.Copy()
-	require.NoError(t, target.SetSlot(source.Slot()+1))
-	hdiff, err := diffToState(source, target)
-	require.NoError(t, err)
-	require.Equal(t, hdiff.slot, target.Slot())
-	require.Equal(t, hdiff.targetVersion, target.Version())
-}
-
-func Test_kmpIndex(t *testing.T) {
-	intSlice := make([]*int, 10)
-	for i := 0; i < len(intSlice); i++ {
-		intSlice[i] = new(int)
-		*intSlice[i] = i
-	}
-	integerEquals := func(a, b *int) bool {
-		if a == nil && b == nil {
-			return true
-		}
-		if a == nil || b == nil {
-			return false
-		}
-		return *a == *b
-	}
-	t.Run("integer entries match", func(t *testing.T) {
-		source := []*int{intSlice[0], intSlice[1], intSlice[2], intSlice[3], intSlice[4]}
-		target := []*int{intSlice[2], intSlice[3], intSlice[4], intSlice[5], intSlice[6], intSlice[7], nil}
-		target = append(target, source...)
-		require.Equal(t, 2, kmpIndex(len(source), target, integerEquals))
-	})
-	t.Run("integer entries skipped", func(t *testing.T) {
-		source := []*int{intSlice[0], intSlice[1], intSlice[2], intSlice[3], intSlice[4]}
-		target := []*int{intSlice[2], intSlice[3], intSlice[4], intSlice[0], intSlice[5], nil}
-		target = append(target, source...)
-		require.Equal(t, 2, kmpIndex(len(source), target, integerEquals))
-	})
-	t.Run("integer entries repetitions", func(t *testing.T) {
-		source := []*int{intSlice[0], intSlice[1], intSlice[0], intSlice[0], intSlice[0]}
-		target := []*int{intSlice[0], intSlice[0], intSlice[1], intSlice[2], intSlice[5], nil}
-		target = append(target, source...)
-		require.Equal(t, 3, kmpIndex(len(source), target, integerEquals))
-	})
-	t.Run("integer entries no match", func(t *testing.T) {
-		source := []*int{intSlice[0], intSlice[1], intSlice[2], intSlice[3]}
-		target := []*int{intSlice[4], intSlice[5], intSlice[6], nil}
-		target = append(target, source...)
-		require.Equal(t, len(source), kmpIndex(len(source), target, integerEquals))
-	})
-
-}

consensus-types/helpers/BUILD.bazel

@@ -1,9 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["comparisons.go"],
-    importpath = "github.com/OffchainLabs/prysm/v6/consensus-types/helpers",
-    visibility = ["//visibility:public"],
-    deps = ["//proto/prysm/v1alpha1:go_default_library"],
-)

consensus-types/helpers/comparisons.go

@@ -1,109 +0,0 @@
-package helpers
-
-import (
-	"bytes"
-
-	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
-)
-
-func ForksEqual(s, t *ethpb.Fork) bool {
-	if s == nil && t == nil {
-		return true
-	}
-	if s == nil || t == nil {
-		return false
-	}
-	if s.Epoch != t.Epoch {
-		return false
-	}
-	if !bytes.Equal(s.PreviousVersion, t.PreviousVersion) {
-		return false
-	}
-	return bytes.Equal(s.CurrentVersion, t.CurrentVersion)
-}
-
-func BlockHeadersEqual(s, t *ethpb.BeaconBlockHeader) bool {
-	if s == nil && t == nil {
-		return true
-	}
-	if s == nil || t == nil {
-		return false
-	}
-	if s.Slot != t.Slot {
-		return false
-	}
-	if s.ProposerIndex != t.ProposerIndex {
-		return false
-	}
-	if !bytes.Equal(s.ParentRoot, t.ParentRoot) {
-		return false
-	}
-	if !bytes.Equal(s.StateRoot, t.StateRoot) {
-		return false
-	}
-	return bytes.Equal(s.BodyRoot, t.BodyRoot)
-}
-
-func Eth1DataEqual(s, t *ethpb.Eth1Data) bool {
-	if s == nil && t == nil {
-		return true
-	}
-	if s == nil || t == nil {
-		return false
-	}
-	if !bytes.Equal(s.DepositRoot, t.DepositRoot) {
-		return false
-	}
-	if s.DepositCount != t.DepositCount {
-		return false
-	}
-	return bytes.Equal(s.BlockHash, t.BlockHash)
-}
-
-func PendingDepositsEqual(s, t *ethpb.PendingDeposit) bool {
-	if s == nil && t == nil {
-		return true
-	}
-	if s == nil || t == nil {
-		return false
-	}
-	if !bytes.Equal(s.PublicKey, t.PublicKey) {
-		return false
-	}
-	if !bytes.Equal(s.WithdrawalCredentials, t.WithdrawalCredentials) {
-		return false
-	}
-	if s.Amount != t.Amount {
-		return false
-	}
-	if !bytes.Equal(s.Signature, t.Signature) {
-		return false
-	}
-	return s.Slot == t.Slot
-}
-
-func PendingPartialWithdrawalsEqual(s, t *ethpb.PendingPartialWithdrawal) bool {
-	if s == nil && t == nil {
-		return true
-	}
-	if s == nil || t == nil {
-		return false
-	}
-	if s.Index != t.Index {
-		return false
-	}
-	if s.Amount != t.Amount {
-		return false
-	}
-	return s.WithdrawableEpoch == t.WithdrawableEpoch
-}
-
-func PendingConsolidationsEqual(s, t *ethpb.PendingConsolidation) bool {
-	if s == nil && t == nil {
-		return true
-	}
-	if s == nil || t == nil {
-		return false
-	}
-	return s.SourceIndex == t.SourceIndex && s.TargetIndex == t.TargetIndex
-}

deps.bzl

@@ -373,8 +373,8 @@ def prysm_deps():
     go_repository(
         name = "com_github_cespare_cp",
         importpath = "github.com/cespare/cp",
-        sum = "h1:nCb6ZLdB7NRaqsm91JtQTAme2SKJzXVsdPIPkyJr1MU=",
-        version = "v1.1.1",
+        sum = "h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=",
+        version = "v0.1.0",
     )
     go_repository(
         name = "com_github_cespare_xxhash",
@@ -1395,6 +1395,12 @@ def prysm_deps():
         sum = "h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=",
         version = "v2.25.1",
     )
+    go_repository(
+        name = "com_github_gtank_ristretto255",
+        importpath = "github.com/gtank/ristretto255",
+        sum = "h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc=",
+        version = "v0.1.2",
+    )
     go_repository(
         name = "com_github_guptarohit_asciigraph",
         importpath = "github.com/guptarohit/asciigraph",

encoding/ssz/htrutils.go

@@ -153,13 +153,6 @@ func WithdrawalRequestsSliceRoot(withdrawalRequests []*enginev1.WithdrawalReques
 	return SliceRoot(withdrawalRequests, limit)
 }
 
-// ConsolidationRequestsSliceRoot computes the HTR of a slice of consolidation requests from the EL.
-// The limit parameter is used as input to the bitwise merkleization algorithm.
-
-func ConsolidationRequestsSliceRoot(consolidationRequests []*enginev1.ConsolidationRequest, limit uint64) ([32]byte, error) {
-	return SliceRoot(consolidationRequests, limit)
-}
-
 // ByteSliceRoot is a helper func to merkleize an arbitrary List[Byte, N]
 // this func runs Chunkify + MerkleizeVector
 // max length is dividable by 32 ( root length )

go.mod

@@ -30,6 +30,7 @@ require (
 	github.com/gostaticanalysis/comment v1.4.2
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
+	github.com/gtank/ristretto255 v0.1.2
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
 	github.com/herumi/bls-eth-go-binary v1.31.0
 	github.com/holiman/uint256 v1.3.2
@@ -112,7 +113,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.17.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cespare/cp v1.1.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
 	github.com/cockroachdb/errors v1.11.3 // indirect

go.sum

@@ -110,8 +110,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/cp v1.1.1 h1:nCb6ZLdB7NRaqsm91JtQTAme2SKJzXVsdPIPkyJr1MU=
-github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
+github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
+github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -452,6 +452,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpg
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
+github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc=
+github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

proto/engine/v1/fulu.proto

@@ -6,7 +6,7 @@ import "proto/eth/ext/options.proto";
 import "proto/engine/v1/execution_engine.proto";
 
 option csharp_namespace = "Ethereum.Engine.V1";
-option go_package = "github.com/prysmaticlabs/prysm/v5/proto/engine/v1;enginev1";
+option go_package = "github.com/OffchainLabs/prysm/v6/proto/engine/v1;enginev1";
 option java_multiple_files = true;
 option java_outer_classname = "ElectraProto";
 option java_package = "org.ethereum.engine.v1";

proto/eth/v1/data_columns.proto

@@ -19,7 +19,7 @@ import "proto/eth/ext/options.proto";
 import "proto/prysm/v1alpha1/beacon_block.proto";
 
 option csharp_namespace = "Ethereum.Eth.v1alpha1";
-option go_package = "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1;eth";
+option go_package = "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1;eth";
 option java_multiple_files = true;
 option java_outer_classname = "DataColumnsProto";
 option java_package = "org.ethereum.eth.v1alpha1";

proto/migration/v1alpha1_to_v1.go

@@ -5,46 +5,6 @@ import (
 	ethpbalpha "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
 )
 
-// V1Alpha1SignedHeaderToV1 converts a v1alpha1 signed beacon block header to v1.
-func V1Alpha1SignedHeaderToV1(v1alpha1Hdr *ethpbalpha.SignedBeaconBlockHeader) *ethpbv1.SignedBeaconBlockHeader {
-	if v1alpha1Hdr == nil || v1alpha1Hdr.Header == nil {
-		return &ethpbv1.SignedBeaconBlockHeader{}
-	}
-	return &ethpbv1.SignedBeaconBlockHeader{
-		Message:   V1Alpha1HeaderToV1(v1alpha1Hdr.Header),
-		Signature: v1alpha1Hdr.Signature,
-	}
-}
-
-// V1Alpha1HeaderToV1 converts a v1alpha1 beacon block header to v1.
-func V1Alpha1HeaderToV1(v1alpha1Hdr *ethpbalpha.BeaconBlockHeader) *ethpbv1.BeaconBlockHeader {
-	if v1alpha1Hdr == nil {
-		return &ethpbv1.BeaconBlockHeader{}
-	}
-
-	return &ethpbv1.BeaconBlockHeader{
-		Slot:          v1alpha1Hdr.Slot,
-		ProposerIndex: v1alpha1Hdr.ProposerIndex,
-		ParentRoot:    v1alpha1Hdr.ParentRoot,
-		StateRoot:     v1alpha1Hdr.StateRoot,
-		BodyRoot:      v1alpha1Hdr.BodyRoot,
-	}
-}
-
-// V1HeaderToV1Alpha1 converts a v1 beacon block header to v1alpha1.
-func V1HeaderToV1Alpha1(v1Header *ethpbv1.BeaconBlockHeader) *ethpbalpha.BeaconBlockHeader {
-	if v1Header == nil {
-		return &ethpbalpha.BeaconBlockHeader{}
-	}
-	return &ethpbalpha.BeaconBlockHeader{
-		Slot:          v1Header.Slot,
-		ProposerIndex: v1Header.ProposerIndex,
-		ParentRoot:    v1Header.ParentRoot,
-		StateRoot:     v1Header.StateRoot,
-		BodyRoot:      v1Header.BodyRoot,
-	}
-}
-
 // V1ValidatorToV1Alpha1 converts a v1 validator to v1alpha1.
 func V1ValidatorToV1Alpha1(v1Validator *ethpbv1.Validator) *ethpbalpha.Validator {
 	if v1Validator == nil {

proto/prysm/v1alpha1/cloners_test.go

@@ -886,25 +886,6 @@ func genPayloadDeneb() *enginev1.ExecutionPayloadDeneb {
 
 var genPayloadElectra = genPayloadDeneb
 
-func genPayloadHeader() *enginev1.ExecutionPayloadHeader {
-	return &enginev1.ExecutionPayloadHeader{
-		ParentHash:       bytes(32),
-		FeeRecipient:     bytes(32),
-		StateRoot:        bytes(32),
-		ReceiptsRoot:     bytes(32),
-		LogsBloom:        bytes(32),
-		PrevRandao:       bytes(32),
-		BlockNumber:      1,
-		GasLimit:         2,
-		GasUsed:          3,
-		Timestamp:        4,
-		ExtraData:        bytes(32),
-		BaseFeePerGas:    bytes(32),
-		BlockHash:        bytes(32),
-		TransactionsRoot: bytes(32),
-	}
-}
-
 func genPayloadHeaderCapella() *enginev1.ExecutionPayloadHeaderCapella {
 	return &enginev1.ExecutionPayloadHeaderCapella{
 		ParentHash:       bytes(32),
@@ -949,14 +930,6 @@ func genPayloadHeaderDeneb() *enginev1.ExecutionPayloadHeaderDeneb {
 
 var genPayloadHeaderElectra = genPayloadHeaderDeneb
 
-func genWithdrawals(num int) []*enginev1.Withdrawal {
-	ws := make([]*enginev1.Withdrawal, num)
-	for i := 0; i < num; i++ {
-		ws[i] = genWithdrawal()
-	}
-	return ws
-}
-
 func genWithdrawal() *enginev1.Withdrawal {
 	return &enginev1.Withdrawal{
 		Index:          123456,

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",

runtime/interop/genesis.go

@@ -67,16 +67,6 @@ var DefaultDepositContractStorage = map[string]string{
 var bigz = big.NewInt(0)
 var minerBalance = big.NewInt(0)
 
-// DefaultCliqueSigner is the testnet miner (clique signer) address encoded in the special way EIP-225 requires.
-// EIP-225 assigns a special meaning to the `extra-data` field in the block header for clique chains.
-// In a clique chain, this field contains one secp256k1 "miner" signature. This allows other nodes to
-// verify that the block was signed by an authorized signer, in place of the typical PoW verification.
-// Clique overloads the meaning of the `miner` and `nonce` fields to implement a voting protocol, whereby additional
-// signatures can be added to the list (for details see `Repurposing header fields for signing and voting` in EIP-225).
-// https://eips.ethereum.org/EIPS/eip-225
-// The following value is for the key used by the e2e test "miner" node.
-const DefaultCliqueSigner = "0x0000000000000000000000000000000000000000000000000000000000000000878705ba3f8bc32fcf7f4caa1a35e72af65cf7660000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-
 // GethShanghaiTime calculates the absolute time of the shanghai (aka capella) fork block
 // by adding the relative time of the capella the fork epoch to the given genesis timestamp.
 func GethShanghaiTime(genesisTime uint64, cfg *clparams.BeaconChainConfig) *uint64 {

testing/endtoend/params/params.go

@@ -126,12 +126,6 @@ var PostElectraDepositCount = uint64(32)
 // PregenesisExecCreds is the number of withdrawal credentials of genesis validators which use an execution address.
 var PregenesisExecCreds = uint64(8)
 
-// NumOfExecEngineTxs is the number of transaction sent to the execution engine.
-var NumOfExecEngineTxs = uint64(200)
-
-// ExpectedExecEngineTxsThreshold is the portion of execution engine transactions we expect to find in blocks.
-var ExpectedExecEngineTxsThreshold = 0.5
-
 // Base port values.
 const (
 	portSpan = 50

testing/util/electra.go

@@ -33,15 +33,6 @@ type electraBlockGenerator struct {
 	payload  *enginev1.ExecutionPayloadDeneb
 }
 
-func WithElectraProposerSigning(idx primitives.ValidatorIndex, sk bls.SecretKey, valRoot []byte) ElectraBlockGeneratorOption {
-	return func(g *electraBlockGenerator) {
-		g.sign = true
-		g.proposer = idx
-		g.sk = sk
-		g.valRoot = valRoot
-	}
-}
-
 func WithElectraPayload(p *enginev1.ExecutionPayloadDeneb) ElectraBlockGeneratorOption {
 	return func(g *electraBlockGenerator) {
 		g.payload = p

testing/util/state.go

@@ -71,19 +71,6 @@ func FillRootsNaturalOptCapella(state *ethpb.BeaconStateCapella) error {
 	return nil
 }
 
-// FillRootsNaturalOptDeneb is meant to be used as an option when calling NewBeaconStateDeneb.
-// It fills state and block roots with hex representations of natural numbers starting with 0.
-// Example: 16 becomes 0x00...0f.
-func FillRootsNaturalOptDeneb(state *ethpb.BeaconStateDeneb) error {
-	roots, err := PrepareRoots(int(params.BeaconConfig().SlotsPerHistoricalRoot))
-	if err != nil {
-		return err
-	}
-	state.StateRoots = roots
-	state.BlockRoots = roots
-	return nil
-}
-
 type NewBeaconStateOption func(state *ethpb.BeaconState) error
 
 // NewBeaconState creates a beacon state with minimum marshalable fields.

validator/client/beacon-api/propose_beacon_block_capella_test.go

@@ -27,7 +27,7 @@ func TestProposeBeaconBlock_Capella(t *testing.T) {
 
 	jsonCapellaBlock, err := structs.SignedBeaconBlockCapellaFromConsensus(capellaBlock.Capella)
 	require.NoError(t, err)
-	
+
 	marshalledBlock, err := json.Marshal(jsonCapellaBlock)
 	require.NoError(t, err)