Revert "Regen historical states for new-state-mgmt compatibility (#…

…5261)"

This reverts commit df9a534.

beacon-chain/blockchain/service.go

@@ -471,10 +471,6 @@ func (s *Service) pruneGarbageState(ctx context.Context, slot uint64) error {
 		return err
 	}
 
-	if err := s.beaconDB.SaveLastArchivedIndex(ctx, 0); err != nil {
-		return err
-	}
-
 	return nil
 }
 

beacon-chain/db/kv/BUILD.bazel

@@ -8,15 +8,14 @@ go_library(
         "attestations.go",
         "backup.go",
         "blocks.go",
-        "check_historical_state.go",
+        "check_state.go",
         "checkpoint.go",
         "deposit_contract.go",
         "encoding.go",
         "finalized_block_roots.go",
         "kv.go",
         "operations.go",
         "powchain.go",
-        "regen_historical_states.go",
         "schema.go",
         "slashings.go",
         "state.go",
@@ -29,15 +28,13 @@ go_library(
     deps = [
         "//beacon-chain/cache:go_default_library",
         "//beacon-chain/core/helpers:go_default_library",
-        "//beacon-chain/core/state:go_default_library",
         "//beacon-chain/db/filters:go_default_library",
         "//beacon-chain/db/iface:go_default_library",
         "//beacon-chain/state:go_default_library",
         "//beacon-chain/state/stateutil:go_default_library",
         "//proto/beacon/db:go_default_library",
         "//proto/beacon/p2p/v1:go_default_library",
         "//shared/bytesutil:go_default_library",
-        "//shared/cmd:go_default_library",
         "//shared/featureconfig:go_default_library",
         "//shared/params:go_default_library",
         "//shared/sliceutil:go_default_library",

beacon-chain/db/kv/archived_point.go

@@ -2,7 +2,6 @@ package kv
 
 import (
 	"context"
-	"encoding/binary"
 
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	bolt "go.etcd.io/bbolt"
@@ -30,21 +29,6 @@ func (k *Store) SaveLastArchivedIndex(ctx context.Context, index uint64) error {
 	})
 }
 
-// LastArchivedIndex from the db.
-func (k *Store) LastArchivedIndex(ctx context.Context) (uint64, error) {
-	ctx, span := trace.StartSpan(ctx, "BeaconDB.LastArchivedIndex")
-	defer span.End()
-	var index uint64
-	err := k.db.Update(func(tx *bolt.Tx) error {
-		bucket := tx.Bucket(archivedIndexRootBucket)
-		b := bucket.Get(lastArchivedIndexKey)
-		index = binary.LittleEndian.Uint64(b)
-		return nil
-	})
-
-	return index, err
-}
-
 // LastArchivedIndexRoot from the db.
 func (k *Store) LastArchivedIndexRoot(ctx context.Context) [32]byte {
 	ctx, span := trace.StartSpan(ctx, "BeaconDB.LastArchivedIndexRoot")

beacon-chain/db/kv/check_state.go

@@ -0,0 +1,33 @@
+package kv
+
+import (
+	"errors"
+
+	"github.com/prysmaticlabs/prysm/shared/featureconfig"
+	bolt "go.etcd.io/bbolt"
+)
+
+var historicalStateDeletedKey = []byte("historical-states-deleted")
+
+func (kv *Store) ensureNewStateServiceCompatible() error {
+	if !featureconfig.Get().NewStateMgmt {
+		return kv.db.Update(func(tx *bolt.Tx) error {
+			bkt := tx.Bucket(newStateServiceCompatibleBucket)
+			return bkt.Put(historicalStateDeletedKey, []byte{0x01})
+		})
+	}
+
+	var historicalStateDeleted bool
+	kv.db.View(func(tx *bolt.Tx) error {
+		bkt := tx.Bucket(newStateServiceCompatibleBucket)
+		v := bkt.Get(historicalStateDeletedKey)
+		historicalStateDeleted = len(v) == 1 && v[0] == 0x01
+		return nil
+	})
+
+	if historicalStateDeleted {
+		return errors.New("historical states were pruned in db, do not run with flag --new-state-mgmt")
+	}
+
+	return nil
+}

beacon-chain/db/kv/kv.go

@@ -1,7 +1,6 @@
 package kv
 
 import (
-	"context"
 	"os"
 	"path"
 	"sync"
@@ -121,7 +120,7 @@ func NewKVStore(dirPath string, stateSummaryCache *cache.StateSummaryCache) (*St
 		return nil, err
 	}
 
-	if err := kv.ensureNewStateServiceCompatible(context.Background()); err != nil {
+	if err := kv.ensureNewStateServiceCompatible(); err != nil {
 		return nil, err
 	}
 

shared/params/config.go

@@ -98,7 +98,6 @@ type BeaconChainConfig struct {
 	EmptySignature            [96]byte      // EmptySignature is used to represent a zeroed out BLS Signature.
 	DefaultPageSize           int           // DefaultPageSize defines the default page size for RPC server request.
 	MaxPeersToSync            int           // MaxPeersToSync describes the limit for number of peers in round robin sync.
-	SlotsPerArchivedPoint     uint64        // SlotsPerArchivedPoint defines the number of slots per one archived point.
 
 	// Slasher constants.
 	WeakSubjectivityPeriod    uint64 // WeakSubjectivityPeriod defines the time period expressed in number of epochs were proof of stake network should validate block headers and attestations for slashable events.
@@ -201,7 +200,6 @@ var defaultBeaconConfig = &BeaconChainConfig{
 	EmptySignature:            [96]byte{},
 	DefaultPageSize:           250,
 	MaxPeersToSync:            15,
-	SlotsPerArchivedPoint:     256,
 
 	// Slasher related values.
 	WeakSubjectivityPeriod:    54000,