chore(storage): Consolidate deposits storage 3/3

beacon/blockchain/deposit.go

@@ -77,7 +77,21 @@ func (s *Service) fetchAndStoreDeposits(
 		)
 	}
 
-	if err = s.storageBackend.DepositStore().EnqueueDeposits(ctx, deposits); err != nil {
+	// before enqueuing deposits verify we are using the right deposit store version
+	depositsStore := s.storageBackend.DepositStore()
+	if s.chainSpec.DepositsV2ActivationSlot() == blockNum {
+		if err = depositsStore.MigrateV1ToV2(ctx); err != nil {
+			s.logger.Error("fetch store deposits, failed migration", "error", err)
+			s.metrics.sink.IncrementCounter(
+				"beacon_kit.execution.deposit.failed_to_enqueue_deposits",
+				"block_num",
+				blockNumStr,
+			)
+			return
+		}
+	}
+
+	if err = depositsStore.EnqueueDeposits(ctx, deposits); err != nil {
 		s.logger.Error("Failed to store deposits", "error", err)
 		s.metrics.sink.IncrementCounter(
 			"beacon_kit.execution.deposit.failed_to_enqueue_deposits",

beacon/blockchain/init_chain.go

@@ -26,6 +26,7 @@ import (
 	"fmt"
 
 	ctypes "github.com/berachain/beacon-kit/consensus-types/types"
+	"github.com/berachain/beacon-kit/primitives/constants"
 	"github.com/berachain/beacon-kit/primitives/transition"
 	"github.com/berachain/beacon-kit/primitives/version"
 )
@@ -61,22 +62,28 @@ func (s *Service) ProcessGenesisData(
 	}
 
 	// Initialize the beacon state from the genesis deposits.
+	genDeposits := genesisData.GetDeposits()
 	validatorUpdates, err := s.stateProcessor.InitializeBeaconStateFromEth1(
 		s.storageBackend.StateFromContext(ctx),
-		genesisData.GetDeposits(),
+		genDeposits,
 		execPayloadHeader,
 		genesisVersion,
 	)
 	if err != nil {
 		return nil, err
 	}
 
+	// before enqueuing deposits verify we are using the right deposit store version
+	depositsStore := s.storageBackend.DepositStore()
+	if s.chainSpec.DepositsV2ActivationSlot() == constants.GenesisSlot {
+		if err = depositsStore.MigrateV1ToV2(ctx); err != nil {
+			return nil, fmt.Errorf("process genesis data, failed migration: %w", err)
+		}
+	}
+
 	// After deposits are validated, store the genesis deposits in the deposit store.
-	if err = s.storageBackend.DepositStore().EnqueueDeposits(
-		ctx,
-		genesisData.GetDeposits(),
-	); err != nil {
-		return nil, err
+	if err = depositsStore.EnqueueDeposits(ctx, genDeposits); err != nil {
+		return nil, fmt.Errorf("process genesis data, failed deposits enqueuing: %w", err)
 	}
 
 	return validatorUpdates, nil

beacon/blockchain/interfaces.go

@@ -185,6 +185,7 @@ type PruningChainSpec interface {
 
 type ServiceChainSpec interface {
 	PruningChainSpec
+	chain.DepositSpec
 	chain.BlobSpec
 	chain.ForkSpec
 	chain.ForkVersionSpec

beacon/validator/block_builder.go

@@ -323,29 +323,38 @@ func (s *Service) buildBlockBody(
 		return fmt.Errorf("failed loading eth1 deposit index: %w", err)
 	}
 
-	// Grab all previous deposits from genesis up to the current index + max deposits per block.
-	deposits, localDepositRoot, err := s.sb.DepositStore().GetDepositsByIndex(
-		ctx,
-		constants.FirstDepositIndex,
-		depositIndex+s.chainSpec.MaxDepositsPerBlock(),
-	)
+	// Load deposits and their root
+	startIdx := constants.FirstDepositIndex
+	depRange := depositIndex + s.chainSpec.MaxDepositsPerBlock()
+	depositMigrationDone := s.chainSpec.DepositsV2ActivationSlot() < blk.GetSlot()
+	if depositMigrationDone {
+		// migration must have done, just load strictly necessary deposits
+		startIdx = depositIndex
+		depRange = s.chainSpec.MaxDepositsPerBlock()
+	}
+
+	deposits, localDepositRoot, err := s.sb.DepositStore().GetDepositsByIndex(ctx, startIdx, depRange)
 	if err != nil {
 		return err
 	}
-	if uint64(len(deposits)) < depositIndex {
-		return errors.Wrapf(ErrDepositStoreIncomplete,
-			"all historical deposits not available, expected: %d, got: %d",
-			depositIndex, len(deposits),
-		)
+
+	if !depositMigrationDone {
+		if uint64(len(deposits)) < depositIndex {
+			return errors.Wrapf(ErrDepositStoreIncomplete,
+				"all historical deposits not available, expected: %d, got: %d",
+				depositIndex, len(deposits),
+			)
+		}
+		deposits = deposits[depositIndex:]
 	}
 	s.logger.Info(
 		"Building block body with local deposits",
-		"start_index", depositIndex, "num_deposits", uint64(len(deposits))-depositIndex,
+		"start_index", depositIndex, "num_deposits", uint64(len(deposits)),
 	)
 
 	eth1Data := ctypes.NewEth1Data(localDepositRoot)
 	body.SetEth1Data(eth1Data)
-	body.SetDeposits(deposits[depositIndex:])
+	body.SetDeposits(deposits)
 
 	// Set the graffiti on the block body.
 	sizedGraffiti := bytes.ExtendToSize([]byte(s.cfg.Graffiti), bytes.B32Size)

beacon/validator/interfaces.go

@@ -111,12 +111,13 @@ type BlockBuilderI interface {
 
 // ChainSpec defines an interface for accessing chain-specific parameters.
 type ChainSpec interface {
+	ctypes.ProposerDomain
+
 	SlotsPerHistoricalRoot() uint64
 	DomainTypeRandao() common.DomainType
 	MaxDepositsPerBlock() uint64
 	ActiveForkVersionForTimestamp(timestamp math.U64) common.Version
 	SlotToEpoch(slot math.Slot) math.Epoch
+	DepositsV2ActivationSlot() math.Slot
 	EpochsPerHistoricalVector() uint64
-
-	ctypes.ProposerDomain
 }

chain/data.go

@@ -23,6 +23,7 @@ package chain
 import (
 	"github.com/berachain/beacon-kit/consensus/cometbft/service/delay"
 	"github.com/berachain/beacon-kit/primitives/common"
+	"github.com/berachain/beacon-kit/primitives/math"
 )
 
 // SpecData is the underlying data structure for chain-specific parameters. All fields with a
@@ -86,6 +87,8 @@ type SpecData struct {
 	MaxDepositsPerBlock uint64 `mapstructure:"max-deposits-per-block"`
 	// DepositEth1ChainID is the chain ID of the execution client.
 	DepositEth1ChainID uint64 `mapstructure:"deposit-eth1-chain-id"`
+	// DepositsV2ActivationSlot returns the slot store v2 is activated
+	DepositsV2ActivationSlot math.Slot `mapstructure:"deposit-v2-activation-slot"`
 	// Eth1FollowDistance is the distance between the eth1 chain and the beacon
 	// chain with respect to reading deposits.
 	Eth1FollowDistance uint64 `mapstructure:"eth1-follow-distance"`

chain/spec.go

@@ -66,6 +66,10 @@ type DepositSpec interface {
 
 	// DepositEth1ChainID returns the chain ID of the deposit contract.
 	DepositEth1ChainID() uint64
+
+	// DepositsV2ActivationSlot returns the slot were we should carry out
+	// data migration from deposit store v1 to v2 and start using v2 instead of v1.
+	DepositsV2ActivationSlot() math.Slot
 }
 
 type DomainTypeSpec interface {
@@ -416,6 +420,11 @@ func (s spec) DepositEth1ChainID() uint64 {
 	return s.Data.DepositEth1ChainID
 }
 
+// DepositsV2ActivationSlot returns the slot store v2 is activated
+func (s spec) DepositsV2ActivationSlot() math.Slot {
+	return s.Data.DepositsV2ActivationSlot
+}
+
 // Eth1FollowDistance returns the distance between the eth1 chain and the beacon
 // chain.
 func (s spec) Eth1FollowDistance() uint64 {

cli/commands/deposit/commands.go

@@ -40,7 +40,7 @@ func Commands(chainSpecCreator servertypes.ChainSpecCreator, appCreator serverty
 		GetValidateDepositCmd(chainSpecCreator),
 		GetCreateValidatorCmd(chainSpecCreator),
 		GetValidatorKeysCmd(),
-		GetDBCheckCmd(appCreator),
+		GetDBCheckCmd(chainSpecCreator, appCreator),
 	)
 
 	return cmd

cli/commands/deposit/db_check.go

@@ -33,13 +33,17 @@ import (
 
 // GetDBCheckCmd returns a command for checking that the deposit store
 // is in sync with the beacon state.
-func GetDBCheckCmd(appCreator servertypes.AppCreator) *cobra.Command {
+func GetDBCheckCmd(chainSpecCreator servertypes.ChainSpecCreator, appCreator servertypes.AppCreator) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "db-check",
 		Short: `Checks if the deposit store is in sync with the beacon state. Fails if either of the beacon or deposit DBs are not available.`,
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			// Create the application from home directory configs and data.
 			v := clicontext.GetViperFromCmd(cmd)
+			cs, err := chainSpecCreator(v)
+			if err != nil {
+				return err
+			}
 			logger := clicontext.GetLoggerFromCmd(cmd)
 			cfg := clicontext.GetConfigFromCmd(cmd)
 			db, err := db.OpenDB(cfg.RootDir, dbm.PebbleDBBackend)
@@ -60,20 +64,43 @@ func GetDBCheckCmd(appCreator servertypes.AppCreator) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			if err = core.ValidateNonGenesisDeposits(
-				ctx,
-				beaconState,
-				depositStore,
-				// maxDepositsPerBlock: 0
-				// In this snapshotted state, we will check up to the existing deposits and not any more.
-				0,
-				// blkDeposits: nil
-				// There are no new block deposits as we are checking at this snapshotted state.
-				nil,
-				// blkDepositRoot: eth1Data.DepositRoot
-				// We will compare against the beacon state's deposit root at this snapshotted state.
-				eth1Data.DepositRoot,
-			); err != nil {
+			stateSlot, err := beaconState.GetSlot()
+			if err != nil {
+				return err
+			}
+
+			if cs.DepositsV2ActivationSlot() < stateSlot {
+				err = core.ValidateNonGenesisDepositsV2(
+					ctx,
+					beaconState,
+					depositStore,
+					// maxDepositsPerBlock: 0
+					// In this snapshotted state, we will check up to the existing deposits and not any more.
+					0,
+					// blkDeposits: nil
+					// There are no new block deposits as we are checking at this snapshotted state.
+					nil,
+					// blkDepositRoot: eth1Data.DepositRoot
+					// We will compare against the beacon state's deposit root at this snapshotted state.
+					eth1Data.DepositRoot,
+				)
+			} else {
+				err = core.ValidateNonGenesisDepositsV1(
+					ctx,
+					beaconState,
+					depositStore,
+					// maxDepositsPerBlock: 0
+					// In this snapshotted state, we will check up to the existing deposits and not any more.
+					0,
+					// blkDeposits: nil
+					// There are no new block deposits as we are checking at this snapshotted state.
+					nil,
+					// blkDepositRoot: eth1Data.DepositRoot
+					// We will compare against the beacon state's deposit root at this snapshotted state.
+					eth1Data.DepositRoot,
+				)
+			}
+			if err != nil {
 				return err
 			}
 

config/spec/devnet.go

@@ -23,6 +23,7 @@ package spec
 import (
 	"github.com/berachain/beacon-kit/chain"
 	"github.com/berachain/beacon-kit/primitives/common"
+	"github.com/berachain/beacon-kit/primitives/constants"
 	"github.com/ethereum/go-ethereum/params"
 )
 
@@ -61,6 +62,9 @@ const (
 
 	// devnetMinValidatorWithdrawabilityDelay is the delay (in epochs) before a validator can withdraw their stake.
 	devnetMinValidatorWithdrawabilityDelay = 32
+
+	// DepositsV2ActivationSlot returns the slot store v2 is activated
+	devnetDepositsV2ActivationSlot = constants.GenesisSlot
 )
 
 // DevnetChainSpecData is the chain.SpecData for a devnet. It is similar to mainnet but
@@ -70,6 +74,7 @@ const (
 func DevnetChainSpecData() *chain.SpecData {
 	specData := MainnetChainSpecData()
 	specData.DepositEth1ChainID = chain.DevnetEth1ChainID
+	specData.DepositsV2ActivationSlot = devnetDepositsV2ActivationSlot
 
 	specData.Config.ConsensusUpdateHeight = 1
 	specData.Config.ConsensusEnableHeight = 2

config/spec/mainnet.go

@@ -21,10 +21,13 @@
 package spec
 
 import (
+	stdmath "math"
+
 	"github.com/berachain/beacon-kit/chain"
 	"github.com/berachain/beacon-kit/consensus/cometbft/service/delay"
 	"github.com/berachain/beacon-kit/primitives/bytes"
 	"github.com/berachain/beacon-kit/primitives/common"
+	"github.com/berachain/beacon-kit/primitives/math"
 	"github.com/ethereum/go-ethereum/params"
 )
 
@@ -102,6 +105,9 @@ const (
 	// These are the heights at which SBT is activated on mainnet.
 	mainnetSBTConsensusUpdateHeight = 9_983_085
 	mainnetSBTConsensusEnableHeight = 9_983_086
+
+	// DepositsV2ActivationSlot returns the slot store v2 is activated
+	mainnetDepositsV2ActivationSlot = math.Slot(stdmath.MaxInt64)
 )
 
 // MainnetChainSpecData is the chain.SpecData for the Berachain mainnet.
@@ -136,6 +142,7 @@ func MainnetChainSpecData() *chain.SpecData {
 		DepositContractAddress:    common.MustNewExecutionAddressFromHex(mainnetDepositContractAddress),
 		MaxDepositsPerBlock:       defaultMaxDepositsPerBlock,
 		DepositEth1ChainID:        chain.MainnetEth1ChainID,
+		DepositsV2ActivationSlot:  mainnetDepositsV2ActivationSlot,
 		Eth1FollowDistance:        defaultEth1FollowDistance,
 		TargetSecondsPerEth1Block: defaultTargetSecondsPerEth1Block,
 

config/spec/testnet.go

@@ -21,7 +21,10 @@
 package spec
 
 import (
+	stdmath "math"
+
 	"github.com/berachain/beacon-kit/chain"
+	"github.com/berachain/beacon-kit/primitives/math"
 )
 
 // TestnetChainSpecData is the chain.SpecData for Berachain's public testnet, Bepolia.
@@ -31,6 +34,8 @@ func TestnetChainSpecData() *chain.SpecData {
 	// Testnet uses chain ID of 80069.
 	specData.DepositEth1ChainID = chain.TestnetEth1ChainID
 
+	specData.DepositsV2ActivationSlot = math.Slot(stdmath.MaxInt64) // TODO: set right value
+
 	// Timestamp of the genesis block of Bepolia testnet.
 	specData.GenesisTime = 1_739_976_735
 

node-api/backend/backend_test.go

@@ -155,7 +155,7 @@ func TestBackendLoadData(t *testing.T) {
 
 			cmtCfg := buildTestCometConfig(t)
 
-			_, kvStore, depositStore, err := statetransition.BuildTestStores()
+			_, kvStore, depositStore, err := statetransition.BuildTestStores(cs)
 			require.NoError(t, err)
 			sb := storage.NewBackend(
 				cs, nil, kvStore, depositStore, nil, log.NewNopLogger(), metrics.NewNoOpTelemetrySink(),

node-api/handlers/beacon/validators_filters_test.go

@@ -546,7 +546,7 @@ func addTestValidators(t *testing.T, stateValidators []*beacontypes.ValidatorDat
 func makeTestState(t *testing.T, cs chain.Spec) *statedb.StateDB {
 	t.Helper()
 
-	cms, kvStore, _, errSt := statetransition.BuildTestStores()
+	cms, kvStore, _, errSt := statetransition.BuildTestStores(cs)
 	require.NoError(t, errSt)
 	sdkCtx := sdk.NewContext(cms.CacheMultiStore(), true, cosmoslog.NewNopLogger())
 	st := statedb.NewBeaconStateFromDB(

state-transition/core/state_processor_payload_test.go

@@ -33,7 +33,6 @@ import (
 	"github.com/berachain/beacon-kit/consensus-types/types"
 	"github.com/berachain/beacon-kit/node-core/components/metrics"
 	"github.com/berachain/beacon-kit/primitives/common"
-	"github.com/berachain/beacon-kit/primitives/constants"
 	"github.com/berachain/beacon-kit/primitives/math"
 	"github.com/berachain/beacon-kit/primitives/transition"
 	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
@@ -146,8 +145,8 @@ func TestPayloadTimestampVerification(t *testing.T) {
 			var depRoot common.Root
 			_, depRoot, err = ds.GetDepositsByIndex(
 				ctx.ConsensusCtx(),
-				constants.FirstDepositIndex,
-				uint64(len(genDeposits))+cs.MaxDepositsPerBlock(),
+				uint64(len(genDeposits)),
+				cs.MaxDepositsPerBlock(),
 			)
 			require.NoError(t, err)