Reduce val index cache

beacon-chain/core/transition/stateutils/validator_index_map.go

@@ -8,6 +8,7 @@ import (
 	"github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
 	"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
 	ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
+	log "github.com/sirupsen/logrus"
 )
 
 // ValidatorIndexMap builds a lookup map for quickly determining the index of
@@ -21,8 +22,12 @@ func ValidatorIndexMap(validators []*ethpb.Validator) map[[fieldparams.BLSPubkey
 		if record == nil {
 			continue
 		}
+		if record.EffectiveBalance == 0 {
+			continue
+		}
 		key := bytesutil.ToBytes48(record.PublicKey)
 		m[key] = primitives.ValidatorIndex(idx)
 	}
+	log.Info("ValidatorIndexMap built with ", len(m), " entries")
 	return m
 }

beacon-chain/execution/service.go

@@ -557,8 +557,8 @@ func (s *Service) initPOWService() {
 				}
 			}
 			// Handle edge case with embedded genesis state by fetching genesis header to determine
-			// its height.
-			if s.chainStartData.Chainstarted && s.chainStartData.GenesisBlock == 0 {
+			// its height only if the deposit requests have not started yet (Pre Pectra EIP-6110 behavior).
+			if s.chainStartData.Chainstarted && s.chainStartData.GenesisBlock == 0 && !s.depositRequestsStarted {
 				genHash := common.BytesToHash(s.chainStartData.Eth1Data.BlockHash)
 				genBlock := s.chainStartData.GenesisBlock
 				// In the event our provided chainstart data references a non-existent block hash,

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

@@ -117,15 +117,40 @@ func (b *BeaconState) ValidatorIndexByPubkey(key [fieldparams.BLSPubkeyLength]by
 		return 0, false
 	}
 	b.lock.RLock()
-	defer b.lock.RUnlock()
 
 	numOfVals := b.validatorsMultiValue.Len(b)
 
+	// Try fast lookup via validator map first
 	idx, ok := b.valMapHandler.Get(key)
-	if ok && primitives.ValidatorIndex(numOfVals) <= idx {
-		return primitives.ValidatorIndex(0), false
+	if ok && idx < primitives.ValidatorIndex(numOfVals) {
+		b.lock.RUnlock()
+		return idx, true
 	}
-	return idx, ok
+	if ok {
+		b.lock.RUnlock()
+		return 0, false // Found in map but out of bounds
+	}
+
+	// Release lock before calling ReadFromEveryValidator to avoid recursive lock
+	b.lock.RUnlock()
+
+	// Fallback: search through all validators using ReadFromEveryValidator
+	var foundIdx primitives.ValidatorIndex
+	var found bool
+
+	err := b.ReadFromEveryValidator(func(i int, val state.ReadOnlyValidator) error {
+		if val.PublicKey() == key {
+			foundIdx = primitives.ValidatorIndex(i)
+			found = true
+			return ErrNilParticipation // Return error to break early
+		}
+		return nil
+	})
+	if err != nil && err != ErrNilParticipation {
+		return 0, false
+	}
+
+	return foundIdx, found
 }
 
 // PubkeyAtIndex returns the pubkey at the given

changelog/fix-genesis-block-eip6110.md

@@ -0,0 +1,3 @@
+### Fixed
+
+- Skip genesis block retrieval when EIP-6110 deposit requests have started to prevent "pruned history unavailable" errors with execution clients that have pruned pre-merge data