Rm skip slot cache

beacon-chain/cache/BUILD.bazel

@@ -17,7 +17,6 @@ go_library(
         "proposer_indices.go",
         "proposer_indices_disabled.go",  # keep
         "proposer_indices_type.go",
-        "skip_slot_cache.go",
         "subnet_ids.go",
         "sync_committee.go",
         "sync_committee_disabled.go",  # keep
@@ -48,7 +47,6 @@ go_library(
         "@com_github_prometheus_client_golang//prometheus:go_default_library",
         "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library",
         "@io_k8s_client_go//tools/cache:go_default_library",
-        "@io_opencensus_go//trace:go_default_library",
     ],
 )
 

beacon-chain/cache/skip_slot_cache.go

@@ -1,141 +0,0 @@
-package cache
-
-import (
-	"context"
-	"math"
-	"sync"
-	"time"
-
-	lru "github.com/hashicorp/golang-lru"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/state"
-	lruwrpr "github.com/prysmaticlabs/prysm/v4/cache/lru"
-	"go.opencensus.io/trace"
-)
-
-var (
-	// Metrics
-	skipSlotCacheHit = promauto.NewCounter(prometheus.CounterOpts{
-		Name: "skip_slot_cache_hit",
-		Help: "The total number of cache hits on the skip slot cache.",
-	})
-	skipSlotCacheMiss = promauto.NewCounter(prometheus.CounterOpts{
-		Name: "skip_slot_cache_miss",
-		Help: "The total number of cache misses on the skip slot cache.",
-	})
-)
-
-// SkipSlotCache is used to store the cached results of processing skip slots in transition.ProcessSlots.
-type SkipSlotCache struct {
-	cache      *lru.Cache
-	lock       sync.RWMutex
-	disabled   bool // Allow for programmatic toggling of the cache, useful during initial sync.
-	inProgress map[[32]byte]bool
-}
-
-// NewSkipSlotCache initializes the map and underlying cache.
-func NewSkipSlotCache() *SkipSlotCache {
-	return &SkipSlotCache{
-		cache:      lruwrpr.New(8),
-		inProgress: make(map[[32]byte]bool),
-	}
-}
-
-// Enable the skip slot cache.
-func (c *SkipSlotCache) Enable() {
-	c.disabled = false
-}
-
-// Disable the skip slot cache.
-func (c *SkipSlotCache) Disable() {
-	c.disabled = true
-}
-
-// Get waits for any in progress calculation to complete before returning a
-// cached response, if any.
-func (c *SkipSlotCache) Get(ctx context.Context, r [32]byte) (state.BeaconState, error) {
-	ctx, span := trace.StartSpan(ctx, "skipSlotCache.Get")
-	defer span.End()
-	if c.disabled {
-		// Return a miss result if cache is not enabled.
-		skipSlotCacheMiss.Inc()
-		return nil, nil
-	}
-
-	delay := minDelay
-
-	// Another identical request may be in progress already. Let's wait until
-	// any in progress request resolves or our timeout is exceeded.
-	inProgress := false
-	for {
-		if ctx.Err() != nil {
-			return nil, ctx.Err()
-		}
-
-		c.lock.RLock()
-		if !c.inProgress[r] {
-			c.lock.RUnlock()
-			break
-		}
-		inProgress = true
-		c.lock.RUnlock()
-
-		// This increasing backoff is to decrease the CPU cycles while waiting
-		// for the in progress boolean to flip to false.
-		time.Sleep(time.Duration(delay) * time.Nanosecond)
-		delay *= delayFactor
-		delay = math.Min(delay, maxDelay)
-	}
-	span.AddAttributes(trace.BoolAttribute("inProgress", inProgress))
-
-	item, exists := c.cache.Get(r)
-
-	if exists && item != nil {
-		skipSlotCacheHit.Inc()
-		span.AddAttributes(trace.BoolAttribute("hit", true))
-		return item.(state.BeaconState).Copy(), nil
-	}
-	skipSlotCacheMiss.Inc()
-	span.AddAttributes(trace.BoolAttribute("hit", false))
-	return nil, nil
-}
-
-// MarkInProgress a request so that any other similar requests will block on
-// Get until MarkNotInProgress is called.
-func (c *SkipSlotCache) MarkInProgress(r [32]byte) error {
-	if c.disabled {
-		return nil
-	}
-
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	if c.inProgress[r] {
-		return ErrAlreadyInProgress
-	}
-	c.inProgress[r] = true
-	return nil
-}
-
-// MarkNotInProgress will release the lock on a given request. This should be
-// called after put.
-func (c *SkipSlotCache) MarkNotInProgress(r [32]byte) {
-	if c.disabled {
-		return
-	}
-
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	delete(c.inProgress, r)
-}
-
-// Put the response in the cache.
-func (c *SkipSlotCache) Put(_ context.Context, r [32]byte, state state.BeaconState) {
-	if c.disabled {
-		return
-	}
-	// Copy state so cached value is not mutated.
-	c.cache.Add(r, state.Copy())
-}

beacon-chain/cache/skip_slot_cache_test.go

@@ -1,37 +0,0 @@
-package cache_test
-
-import (
-	"context"
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/cache"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/state"
-	state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native"
-	ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1"
-	"github.com/prysmaticlabs/prysm/v4/testing/assert"
-	"github.com/prysmaticlabs/prysm/v4/testing/require"
-)
-
-func TestSkipSlotCache_RoundTrip(t *testing.T) {
-	ctx := context.Background()
-	c := cache.NewSkipSlotCache()
-
-	r := [32]byte{'a'}
-	s, err := c.Get(ctx, r)
-	require.NoError(t, err)
-	assert.Equal(t, state.BeaconState(nil), s, "Empty cache returned an object")
-
-	require.NoError(t, c.MarkInProgress(r))
-
-	s, err = state_native.InitializeFromProtoPhase0(&ethpb.BeaconState{
-		Slot: 10,
-	})
-	require.NoError(t, err)
-
-	c.Put(ctx, r, s)
-	c.MarkNotInProgress(r)
-
-	res, err := c.Get(ctx, r)
-	require.NoError(t, err)
-	assert.DeepEqual(t, res.ToProto(), s.ToProto(), "Expected equal protos to return from cache")
-}

beacon-chain/core/transition/BUILD.bazel

@@ -4,7 +4,6 @@ go_library(
     name = "go_default_library",
     srcs = [
         "log.go",
-        "skip_slot_cache.go",
         "state.go",
         "state-bellatrix.go",
         "trailing_slot_state_cache.go",
@@ -14,7 +13,6 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition",
     visibility = ["//visibility:public"],
     deps = [
-        "//beacon-chain/cache:go_default_library",
         "//beacon-chain/core/altair:go_default_library",
         "//beacon-chain/core/blocks:go_default_library",
         "//beacon-chain/core/capella:go_default_library",
@@ -36,7 +34,6 @@ go_library(
         "//consensus-types/primitives:go_default_library",
         "//container/trie:go_default_library",
         "//crypto/bls:go_default_library",
-        "//crypto/hash:go_default_library",
         "//encoding/bytesutil:go_default_library",
         "//math:go_default_library",
         "//monitoring/tracing:go_default_library",
@@ -58,7 +55,6 @@ go_test(
         "altair_transition_no_verify_sig_test.go",
         "bellatrix_transition_no_verify_sig_test.go",
         "benchmarks_test.go",
-        "skip_slot_cache_test.go",
         "state_fuzz_test.go",
         "state_test.go",
         "trailing_slot_state_cache_test.go",

beacon-chain/core/transition/skip_slot_cache.go

@@ -1,32 +0,0 @@
-package transition
-
-import (
-	"context"
-	"errors"
-
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/cache"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/state"
-	"github.com/prysmaticlabs/prysm/v4/crypto/hash"
-	"github.com/prysmaticlabs/prysm/v4/encoding/bytesutil"
-)
-
-// SkipSlotCache exists for the unlikely scenario that is a large gap between the head state and
-// the current slot. If the beacon chain were ever to be stalled for several epochs, it may be
-// difficult or impossible to compute the appropriate beacon state for assignments within a
-// reasonable amount of time.
-var SkipSlotCache = cache.NewSkipSlotCache()
-
-// The key for skip slot cache is mixed between state root and state slot.
-// state root is in the mix to defend against different forks with same skip slots
-// to hit the same cache. We don't want beacon states mixed up between different chains.
-func cacheKey(_ context.Context, state state.ReadOnlyBeaconState) ([32]byte, error) {
-	bh := state.LatestBlockHeader()
-	if bh == nil {
-		return [32]byte{}, errors.New("block head in state can't be nil")
-	}
-	r, err := bh.HashTreeRoot()
-	if err != nil {
-		return [32]byte{}, err
-	}
-	return hash.Hash(append(bytesutil.Bytes32(uint64(state.Slot())), r[:]...)), nil
-}

beacon-chain/core/transition/skip_slot_cache_test.go

@@ -1,169 +0,0 @@
-package transition_test
-
-import (
-	"context"
-	"sync"
-	"testing"
-
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/state"
-	state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native"
-	"github.com/prysmaticlabs/prysm/v4/config/params"
-	"github.com/prysmaticlabs/prysm/v4/consensus-types/blocks"
-	"github.com/prysmaticlabs/prysm/v4/runtime/version"
-	"github.com/prysmaticlabs/prysm/v4/testing/assert"
-	"github.com/prysmaticlabs/prysm/v4/testing/require"
-	"github.com/prysmaticlabs/prysm/v4/testing/util"
-)
-
-func TestSkipSlotCache_OK(t *testing.T) {
-	transition.SkipSlotCache.Enable()
-	defer transition.SkipSlotCache.Disable()
-	bState, privs := util.DeterministicGenesisState(t, params.MinimalSpecConfig().MinGenesisActiveValidatorCount)
-	pbState, err := state_native.ProtobufBeaconStatePhase0(bState.ToProto())
-	require.NoError(t, err)
-	originalState, err := state_native.InitializeFromProtoPhase0(pbState)
-	require.NoError(t, err)
-
-	blkCfg := util.DefaultBlockGenConfig()
-	blkCfg.NumAttestations = 1
-
-	// First transition will be with an empty cache, so the cache becomes populated
-	// with the state
-	blk, err := util.GenerateFullBlock(bState, privs, blkCfg, originalState.Slot()+10)
-	require.NoError(t, err)
-	wsb, err := blocks.NewSignedBeaconBlock(blk)
-	require.NoError(t, err)
-	executedState, err := transition.ExecuteStateTransition(context.Background(), originalState, wsb)
-	require.NoError(t, err, "Could not run state transition")
-	require.Equal(t, true, executedState.Version() == version.Phase0)
-	wsb, err = blocks.NewSignedBeaconBlock(blk)
-	require.NoError(t, err)
-	bState, err = transition.ExecuteStateTransition(context.Background(), bState, wsb)
-	require.NoError(t, err, "Could not process state transition")
-
-	assert.DeepEqual(t, originalState.ToProto(), bState.ToProto(), "Skipped slots cache leads to different states")
-}
-
-func TestSkipSlotCache_ConcurrentMixup(t *testing.T) {
-	bState, privs := util.DeterministicGenesisState(t, params.MinimalSpecConfig().MinGenesisActiveValidatorCount)
-	pbState, err := state_native.ProtobufBeaconStatePhase0(bState.ToProto())
-	require.NoError(t, err)
-	originalState, err := state_native.InitializeFromProtoPhase0(pbState)
-	require.NoError(t, err)
-
-	blkCfg := util.DefaultBlockGenConfig()
-	blkCfg.NumAttestations = 1
-
-	transition.SkipSlotCache.Disable()
-
-	// First transition will be with an empty cache, so the cache becomes populated
-	// with the state
-	blk, err := util.GenerateFullBlock(bState, privs, blkCfg, originalState.Slot()+10)
-	require.NoError(t, err)
-	wsb, err := blocks.NewSignedBeaconBlock(blk)
-	require.NoError(t, err)
-	executedState, err := transition.ExecuteStateTransition(context.Background(), originalState, wsb)
-	require.NoError(t, err, "Could not run state transition")
-	require.Equal(t, true, executedState.Version() == version.Phase0)
-
-	// Create two shallow but different forks
-	var s1, s0 state.BeaconState
-	{
-		blk, err := util.GenerateFullBlock(originalState.Copy(), privs, blkCfg, originalState.Slot()+10)
-		require.NoError(t, err)
-		copy(blk.Block.Body.Graffiti, "block 1")
-		signature, err := util.BlockSignature(originalState, blk.Block, privs)
-		require.NoError(t, err)
-		blk.Signature = signature.Marshal()
-		wsb, err := blocks.NewSignedBeaconBlock(blk)
-		require.NoError(t, err)
-		s1, err = transition.ExecuteStateTransition(context.Background(), originalState.Copy(), wsb)
-		require.NoError(t, err, "Could not run state transition")
-	}
-
-	{
-		blk, err := util.GenerateFullBlock(originalState.Copy(), privs, blkCfg, originalState.Slot()+10)
-		require.NoError(t, err)
-		copy(blk.Block.Body.Graffiti, "block 2")
-		signature, err := util.BlockSignature(originalState, blk.Block, privs)
-		require.NoError(t, err)
-		blk.Signature = signature.Marshal()
-		wsb, err := blocks.NewSignedBeaconBlock(blk)
-		require.NoError(t, err)
-		s0, err = transition.ExecuteStateTransition(context.Background(), originalState.Copy(), wsb)
-		require.NoError(t, err, "Could not run state transition")
-	}
-
-	r1, err := s1.HashTreeRoot(context.Background())
-	require.NoError(t, err)
-	r2, err := s0.HashTreeRoot(context.Background())
-	require.NoError(t, err)
-	if r1 == r2 {
-		t.Fatalf("need different starting states, got: %x", r1)
-	}
-
-	if s1.Slot() != s0.Slot() {
-		t.Fatalf("expecting different chains, but states at same slot")
-	}
-
-	// prepare copies for both states
-	var setups []state.BeaconState
-	for i := uint64(0); i < 300; i++ {
-		var st state.BeaconState
-		if i%2 == 0 {
-			st = s1
-		} else {
-			st = s0
-		}
-		setups = append(setups, st.Copy())
-	}
-
-	problemSlot := s1.Slot() + 2
-	expected1, err := transition.ProcessSlots(context.Background(), s1.Copy(), problemSlot)
-	require.NoError(t, err)
-	expectedRoot1, err := expected1.HashTreeRoot(context.Background())
-	require.NoError(t, err)
-	t.Logf("chain 1 (even i) expected root %x at slot %d", expectedRoot1[:], problemSlot)
-
-	tmp1, err := transition.ProcessSlots(context.Background(), expected1.Copy(), problemSlot+1)
-	require.NoError(t, err)
-	gotRoot := tmp1.StateRoots()[problemSlot]
-	require.DeepEqual(t, expectedRoot1[:], gotRoot, "State roots for chain 1 are bad, expected root doesn't match")
-
-	expected2, err := transition.ProcessSlots(context.Background(), s0.Copy(), problemSlot)
-	require.NoError(t, err)
-	expectedRoot2, err := expected2.HashTreeRoot(context.Background())
-	require.NoError(t, err)
-	t.Logf("chain 2 (odd i) expected root %x at slot %d", expectedRoot2[:], problemSlot)
-
-	tmp2, err := transition.ProcessSlots(context.Background(), expected2.Copy(), problemSlot+1)
-	require.NoError(t, err)
-	gotRoot = tmp2.StateRoots()[problemSlot]
-	require.DeepEqual(t, expectedRoot2[:], gotRoot, "State roots for chain 2 are bad, expected root doesn't match")
-
-	var wg sync.WaitGroup
-	wg.Add(len(setups))
-
-	step := func(i int, setup state.BeaconState) {
-		// go at least 1 past problemSlot, to ensure problem slot state root is available
-		outState, err := transition.ProcessSlots(context.Background(), setup, problemSlot.Add(1+uint64(i))) // keep increasing, to hit and extend the cache
-		require.NoError(t, err, "Could not process state transition")
-		roots := outState.StateRoots()
-		gotRoot := roots[problemSlot]
-		if i%2 == 0 {
-			assert.DeepEqual(t, expectedRoot1[:], gotRoot, "Unexpected root on chain 1")
-		} else {
-			assert.DeepEqual(t, expectedRoot2[:], gotRoot, "Unexpected root on chain 2")
-		}
-		wg.Done()
-	}
-
-	transition.SkipSlotCache.Enable()
-	// now concurrently apply the blocks (alternating between states, and increasing skip slots)
-	for i, setup := range setups {
-		go step(i, setup)
-	}
-	// Wait for all transitions to finish
-	wg.Wait()
-}

beacon-chain/core/transition/state_fuzz_test.go

@@ -11,8 +11,6 @@ import (
 )
 
 func TestGenesisBeaconState_1000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	fuzzer := fuzz.NewWithSeed(0)
 	fuzzer.NilChance(0.1)
 	deposits := make([]*ethpb.Deposit, 300000)
@@ -33,8 +31,6 @@ func TestGenesisBeaconState_1000(t *testing.T) {
 }
 
 func TestOptimizedGenesisBeaconState_1000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	fuzzer := fuzz.NewWithSeed(0)
 	fuzzer.NilChance(0.1)
 	var genesisTime uint64
@@ -56,8 +52,6 @@ func TestOptimizedGenesisBeaconState_1000(t *testing.T) {
 }
 
 func TestIsValidGenesisState_100000(_ *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	fuzzer := fuzz.NewWithSeed(0)
 	fuzzer.NilChance(0.1)
 	var chainStartDepositCount, currentTime uint64

beacon-chain/core/transition/transition.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 
 	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/cache"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/altair"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/capella"
 	e "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch"
@@ -199,49 +198,8 @@ func ProcessSlots(ctx context.Context, state state.BeaconState, slot primitives.
 		return nil, err
 	}
 
-	highestSlot := state.Slot()
-	key, err := cacheKey(ctx, state)
-	if err != nil {
-		return nil, err
-	}
-
-	// Restart from cached value, if one exists.
-	cachedState, err := SkipSlotCache.Get(ctx, key)
-	if err != nil {
-		return nil, err
-	}
-
-	if cachedState != nil && !cachedState.IsNil() && cachedState.Slot() < slot {
-		highestSlot = cachedState.Slot()
-		state = cachedState
-	}
-	if err := SkipSlotCache.MarkInProgress(key); errors.Is(err, cache.ErrAlreadyInProgress) {
-		cachedState, err = SkipSlotCache.Get(ctx, key)
-		if err != nil {
-			return nil, err
-		}
-		if cachedState != nil && !cachedState.IsNil() && cachedState.Slot() < slot {
-			highestSlot = cachedState.Slot()
-			state = cachedState
-		}
-	} else if err != nil {
-		return nil, err
-	}
-	defer func() {
-		SkipSlotCache.MarkNotInProgress(key)
-	}()
-
+	var err error
 	for state.Slot() < slot {
-		if ctx.Err() != nil {
-			tracing.AnnotateError(span, ctx.Err())
-			// Cache last best value.
-			if highestSlot < state.Slot() {
-				if SkipSlotCache.Put(ctx, key, state); err != nil {
-					log.WithError(err).Error("Failed to put skip slot cache value")
-				}
-			}
-			return nil, ctx.Err()
-		}
 		state, err = ProcessSlot(ctx, state)
 		if err != nil {
 			tracing.AnnotateError(span, err)
@@ -294,10 +252,6 @@ func ProcessSlots(ctx context.Context, state state.BeaconState, slot primitives.
 		}
 	}
 
-	if highestSlot < state.Slot() {
-		SkipSlotCache.Put(ctx, key, state)
-	}
-
 	return state, nil
 }
 

beacon-chain/core/transition/transition_fuzz_test.go

@@ -14,8 +14,6 @@ import (
 )
 
 func TestFuzzExecuteStateTransition_1000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	ctx := context.Background()
 	state, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	require.NoError(t, err)
@@ -38,8 +36,6 @@ func TestFuzzExecuteStateTransition_1000(t *testing.T) {
 }
 
 func TestFuzzCalculateStateRoot_1000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	ctx := context.Background()
 	state, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	require.NoError(t, err)
@@ -62,8 +58,6 @@ func TestFuzzCalculateStateRoot_1000(t *testing.T) {
 }
 
 func TestFuzzProcessSlot_1000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	ctx := context.Background()
 	state, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	require.NoError(t, err)
@@ -79,8 +73,6 @@ func TestFuzzProcessSlot_1000(t *testing.T) {
 }
 
 func TestFuzzProcessSlots_1000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	ctx := context.Background()
 	state, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	require.NoError(t, err)
@@ -98,8 +90,6 @@ func TestFuzzProcessSlots_1000(t *testing.T) {
 }
 
 func TestFuzzprocessOperationsNoVerify_1000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	ctx := context.Background()
 	state, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	require.NoError(t, err)
@@ -122,8 +112,6 @@ func TestFuzzprocessOperationsNoVerify_1000(t *testing.T) {
 }
 
 func TestFuzzverifyOperationLengths_10000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	state, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	require.NoError(t, err)
 	bb := &ethpb.SignedBeaconBlock{}
@@ -143,8 +131,6 @@ func TestFuzzverifyOperationLengths_10000(t *testing.T) {
 }
 
 func TestFuzzCanProcessEpoch_10000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	state, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	require.NoError(t, err)
 	fuzzer := fuzz.NewWithSeed(0)
@@ -156,8 +142,6 @@ func TestFuzzCanProcessEpoch_10000(t *testing.T) {
 }
 
 func TestFuzzProcessEpochPrecompute_1000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	ctx := context.Background()
 	state, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	require.NoError(t, err)
@@ -173,8 +157,6 @@ func TestFuzzProcessEpochPrecompute_1000(t *testing.T) {
 }
 
 func TestFuzzProcessBlockForStateRoot_1000(t *testing.T) {
-	SkipSlotCache.Disable()
-	defer SkipSlotCache.Enable()
 	ctx := context.Background()
 	state, err := state_native.InitializeFromProtoUnsafePhase0(&ethpb.BeaconState{})
 	require.NoError(t, err)

beacon-chain/core/transition/transition_test.go

@@ -27,10 +27,6 @@ import (
 	"github.com/prysmaticlabs/prysm/v4/testing/util"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 func TestExecuteStateTransition_IncorrectSlot(t *testing.T) {
 	base := &ethpb.BeaconState{
 		Slot: 5,
@@ -507,7 +503,6 @@ func TestProcessSlots_LowerSlotAsParentState(t *testing.T) {
 }
 
 func TestProcessSlots_ThroughAltairEpoch(t *testing.T) {
-	transition.SkipSlotCache.Disable()
 	params.SetupTestConfigCleanup(t)
 	conf := params.BeaconConfig()
 	conf.AltairForkEpoch = 5
@@ -542,7 +537,6 @@ func TestProcessSlots_ThroughAltairEpoch(t *testing.T) {
 }
 
 func TestProcessSlots_OnlyAltairEpoch(t *testing.T) {
-	transition.SkipSlotCache.Disable()
 	params.SetupTestConfigCleanup(t)
 	conf := params.BeaconConfig()
 	conf.AltairForkEpoch = 5
@@ -578,7 +572,6 @@ func TestProcessSlots_OnlyAltairEpoch(t *testing.T) {
 }
 
 func TestProcessSlots_OnlyBellatrixEpoch(t *testing.T) {
-	transition.SkipSlotCache.Disable()
 	params.SetupTestConfigCleanup(t)
 	conf := params.BeaconConfig().Copy()
 	conf.BellatrixForkEpoch = 5
@@ -615,7 +608,6 @@ func TestProcessSlots_OnlyBellatrixEpoch(t *testing.T) {
 }
 
 func TestProcessSlots_ThroughBellatrixEpoch(t *testing.T) {
-	transition.SkipSlotCache.Disable()
 	params.SetupTestConfigCleanup(t)
 	conf := params.BeaconConfig()
 	conf.BellatrixForkEpoch = 5

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

@@ -95,7 +95,6 @@ go_test(
         "//beacon-chain/core/helpers:go_default_library",
         "//beacon-chain/core/signing:go_default_library",
         "//beacon-chain/core/time:go_default_library",
-        "//beacon-chain/core/transition:go_default_library",
         "//beacon-chain/db:go_default_library",
         "//beacon-chain/db/testing:go_default_library",
         "//beacon-chain/forkchoice/doubly-linked-tree:go_default_library",

beacon-chain/rpc/prysm/v1alpha1/beacon/validators_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/epoch/precompute"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/helpers"
 	coreTime "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/time"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/db"
 	dbTest "github.com/prysmaticlabs/prysm/v4/beacon-chain/db/testing"
 	doublylinkedtree "github.com/prysmaticlabs/prysm/v4/beacon-chain/forkchoice/doubly-linked-tree"
@@ -1024,7 +1023,6 @@ func TestServer_ListValidators_DefaultPageSize(t *testing.T) {
 func TestServer_ListValidators_FromOldEpoch(t *testing.T) {
 	params.SetupTestConfigCleanup(t)
 	params.OverrideBeaconConfig(params.BeaconConfig())
-	transition.SkipSlotCache.Disable()
 
 	ctx := context.Background()
 	slot := primitives.Slot(0)
@@ -1667,7 +1665,6 @@ func TestServer_GetValidatorParticipation_OrphanedUntilGenesis(t *testing.T) {
 func TestServer_GetValidatorParticipation_CurrentAndPrevEpochWithBits(t *testing.T) {
 	params.SetupTestConfigCleanup(t)
 	params.OverrideBeaconConfig(params.BeaconConfig())
-	transition.SkipSlotCache.Disable()
 
 	t.Run("altair", func(t *testing.T) {
 		validatorCount := uint64(32)

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

@@ -322,7 +322,6 @@ func TestServer_GetBeaconBlock_Bellatrix(t *testing.T) {
 func TestServer_GetBeaconBlock_Capella(t *testing.T) {
 	db := dbutil.SetupDB(t)
 	ctx := context.Background()
-	transition.SkipSlotCache.Disable()
 
 	params.SetupTestConfigCleanup(t)
 	cfg := params.BeaconConfig().Copy()

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

@@ -8,7 +8,6 @@ import (
 	mock "github.com/prysmaticlabs/prysm/v4/beacon-chain/blockchain/testing"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed"
 	opfeed "github.com/prysmaticlabs/prysm/v4/beacon-chain/core/feed/operation"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/operations/synccommittee"
 	mockp2p "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing"
 	fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams"
@@ -82,9 +81,6 @@ func TestSubmitSyncMessage_OK(t *testing.T) {
 }
 
 func TestGetSyncSubcommitteeIndex_Ok(t *testing.T) {
-	transition.SkipSlotCache.Disable()
-	defer transition.SkipSlotCache.Enable()
-
 	server := &Server{
 		HeadFetcher: &mock.ChainService{
 			SyncCommitteeIndices: []primitives.CommitteeIndex{0},

beacon-chain/sync/initial-sync/BUILD.bazel

@@ -21,7 +21,6 @@ go_library(
         "//beacon-chain/core/feed:go_default_library",
         "//beacon-chain/core/feed/block:go_default_library",
         "//beacon-chain/core/feed/state:go_default_library",
-        "//beacon-chain/core/transition:go_default_library",
         "//beacon-chain/db:go_default_library",
         "//beacon-chain/p2p:go_default_library",
         "//beacon-chain/p2p/peers/scorers:go_default_library",

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

@@ -9,7 +9,6 @@ import (
 
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/paulbellamy/ratecounter"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition"
 	"github.com/prysmaticlabs/prysm/v4/consensus-types/interfaces"
 	"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives"
 	"github.com/prysmaticlabs/prysm/v4/time/slots"
@@ -38,8 +37,6 @@ type batchBlockReceiverFn func(ctx context.Context, blks []interfaces.ReadOnlySi
 func (s *Service) roundRobinSync(genesis time.Time) error {
 	ctx, cancel := context.WithCancel(s.ctx)
 	defer cancel()
-	transition.SkipSlotCache.Disable()
-	defer transition.SkipSlotCache.Enable()
 
 	s.counter = ratecounter.NewRateCounter(counterSeconds * time.Second)
 

beacon-chain/sync/rpc_test.go

@@ -10,7 +10,6 @@ import (
 	libp2pcore "github.com/libp2p/go-libp2p/core"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/protocol"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition"
 	prysmP2P "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/encoder"
 	p2ptest "github.com/prysmaticlabs/prysm/v4/beacon-chain/p2p/testing"
@@ -20,10 +19,6 @@ import (
 	"github.com/prysmaticlabs/prysm/v4/testing/util"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // expectSuccess status code from a stream in regular sync.
 func expectSuccess(t *testing.T, stream network.Stream) {
 	code, errMsg, err := ReadStatusCode(stream, &encoder.SszNetworkEncoder{})

testing/endtoend/endtoend_test.go

@@ -25,7 +25,6 @@ import (
 	"google.golang.org/grpc/status"
 
 	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition"
 	"github.com/prysmaticlabs/prysm/v4/config/params"
 	"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives"
 	eth "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1"
@@ -52,10 +51,6 @@ const (
 	errGeneralCode = "exit status 1"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // testRunner abstracts E2E test configuration and running.
 type testRunner struct {
 	t          *testing.T

testing/spectest/shared/altair/finality/finality.go

@@ -18,10 +18,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 type Config struct {
 	BlocksCount int `json:"blocks_count"`
 }

testing/spectest/shared/altair/fork/transition.go

@@ -19,10 +19,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 type ForkConfig struct {
 	PostFork    string `json:"post_fork"`
 	ForkEpoch   int    `json:"fork_epoch"`

testing/spectest/shared/altair/sanity/block_processing.go

@@ -23,10 +23,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // RunBlockProcessingTest executes "sanity/blocks" tests.
 func RunBlockProcessingTest(t *testing.T, config, folderPath string) {
 	require.NoError(t, utils.SetConfig(t, config))

testing/spectest/shared/altair/sanity/slot_processing.go

@@ -16,10 +16,6 @@ import (
 	"gopkg.in/d4l3k/messagediff.v1"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // RunSlotProcessingTests executes "sanity/slots" tests.
 func RunSlotProcessingTests(t *testing.T, config string) {
 	require.NoError(t, utils.SetConfig(t, config))

testing/spectest/shared/bellatrix/finality/finality.go

@@ -18,10 +18,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 type Config struct {
 	BlocksCount int `json:"blocks_count"`
 }

testing/spectest/shared/bellatrix/sanity/block_processing.go

@@ -23,10 +23,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // RunBlockProcessingTest executes "sanity/blocks" tests.
 func RunBlockProcessingTest(t *testing.T, config, folderPath string) {
 	require.NoError(t, utils.SetConfig(t, config))

testing/spectest/shared/bellatrix/sanity/slot_processing.go

@@ -16,10 +16,6 @@ import (
 	"gopkg.in/d4l3k/messagediff.v1"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // RunSlotProcessingTests executes "sanity/slots" tests.
 func RunSlotProcessingTests(t *testing.T, config string) {
 	require.NoError(t, utils.SetConfig(t, config))

testing/spectest/shared/capella/finality/finality.go

@@ -18,10 +18,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 type Config struct {
 	BlocksCount int `json:"blocks_count"`
 }

testing/spectest/shared/capella/sanity/block_processing.go

@@ -23,10 +23,6 @@ import (
 	"gopkg.in/d4l3k/messagediff.v1"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // RunBlockProcessingTest executes "sanity/blocks" tests.
 func RunBlockProcessingTest(t *testing.T, config, folderPath string) {
 	require.NoError(t, utils.SetConfig(t, config))

testing/spectest/shared/capella/sanity/slot_processing.go

@@ -16,10 +16,6 @@ import (
 	"gopkg.in/d4l3k/messagediff.v1"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // RunSlotProcessingTests executes "sanity/slots" tests.
 func RunSlotProcessingTests(t *testing.T, config string) {
 	require.NoError(t, utils.SetConfig(t, config))

testing/spectest/shared/common/forkchoice/BUILD.bazel

@@ -17,7 +17,6 @@ go_library(
         "//beacon-chain/cache:go_default_library",
         "//beacon-chain/cache/depositcache:go_default_library",
         "//beacon-chain/core/time:go_default_library",
-        "//beacon-chain/core/transition:go_default_library",
         "//beacon-chain/db/testing:go_default_library",
         "//beacon-chain/execution:go_default_library",
         "//beacon-chain/forkchoice/doubly-linked-tree:go_default_library",

testing/spectest/shared/common/forkchoice/runner.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/golang/snappy"
-	"github.com/prysmaticlabs/prysm/v4/beacon-chain/core/transition"
 	"github.com/prysmaticlabs/prysm/v4/beacon-chain/state"
 	state_native "github.com/prysmaticlabs/prysm/v4/beacon-chain/state/state-native"
 	fieldparams "github.com/prysmaticlabs/prysm/v4/config/fieldparams"
@@ -19,10 +18,6 @@ import (
 	"github.com/prysmaticlabs/prysm/v4/testing/util"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // Run executes "forkchoice"  and "sync" test.
 func Run(t *testing.T, config string, fork int) {
 	runTest(t, config, fork, "fork_choice")

testing/spectest/shared/phase0/finality/runner.go

@@ -19,10 +19,6 @@ import (
 	"gopkg.in/d4l3k/messagediff.v1"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 type Config struct {
 	BlocksCount int `json:"blocks_count"`
 }

testing/spectest/shared/phase0/sanity/block_processing.go

@@ -23,10 +23,6 @@ import (
 	"gopkg.in/d4l3k/messagediff.v1"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // RunBlockProcessingTest executes "sanity/blocks" tests.
 func RunBlockProcessingTest(t *testing.T, config, folderPath string) {
 	require.NoError(t, utils.SetConfig(t, config))

testing/spectest/shared/phase0/sanity/slot_processing.go

@@ -16,10 +16,6 @@ import (
 	"gopkg.in/d4l3k/messagediff.v1"
 )
 
-func init() {
-	transition.SkipSlotCache.Disable()
-}
-
 // RunSlotProcessingTests executes "sanity/slots" tests.
 func RunSlotProcessingTests(t *testing.T, config string) {
 	require.NoError(t, utils.SetConfig(t, config))