chore(storage): Consolidate deposits storage 3/3

beacon/blockchain/interfaces.go

@@ -37,7 +37,7 @@ import (
 	"github.com/berachain/beacon-kit/state-transition/core"
 	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
 	"github.com/berachain/beacon-kit/storage/block"
-	depositdb "github.com/berachain/beacon-kit/storage/deposit"
+	"github.com/berachain/beacon-kit/storage/deposit"
 	cmtabci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -115,7 +115,7 @@ type StorageBackend interface {
 	// StateFromContext retrieves the beacon state from the given context.
 	StateFromContext(context.Context) *statedb.StateDB
 	// DepositStore retrieves the deposit store.
-	DepositStore() *depositdb.KVStore
+	DepositStore() deposit.Store
 	// BlockStore retrieves the block store.
 	BlockStore() *block.KVStore[*ctypes.BeaconBlock]
 }

beacon/validator/block_builder.go

@@ -298,7 +298,7 @@ func (s *Service) buildBlockBody(
 	}
 
 	// Grab all previous deposits from genesis up to the current index + max deposits per block.
-	deposits, err := s.sb.DepositStore().GetDepositsByIndex(
+	deposits, _, err := s.sb.DepositStore().GetDepositsByIndex(
 		ctx,
 		constants.FirstDepositIndex,
 		depositIndex+s.chainSpec.MaxDepositsPerBlock(),

beacon/validator/interfaces.go

@@ -33,7 +33,7 @@ import (
 	"github.com/berachain/beacon-kit/primitives/transition"
 	"github.com/berachain/beacon-kit/state-transition/core"
 	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
-	depositdb "github.com/berachain/beacon-kit/storage/deposit"
+	"github.com/berachain/beacon-kit/storage/deposit"
 )
 
 // BlobFactory represents a blob factory interface.
@@ -91,7 +91,7 @@ type StateProcessor interface {
 // StorageBackend is the interface for the storage backend.
 type StorageBackend interface {
 	// DepositStore retrieves the deposit store.
-	DepositStore() *depositdb.KVStore
+	DepositStore() deposit.Store
 	// StateFromContext retrieves the beacon state from the context.
 	StateFromContext(context.Context) *statedb.StateDB
 }

consensus/cometbft/service/process_proposal.go

@@ -50,7 +50,7 @@ func (s *Service) processProposal(
 	// called
 	// again in a subsequent round. However, we only want to do this after we've
 	// processed the first block, as we want to avoid overwriting the
-	// finalizeState
+	// finalizeBlockState
 	// after state changes during InitChain.
 	s.processProposalState = s.resetState(ctx)
 	if req.Height > s.initialHeight {

node-core/components/backend.go

@@ -30,7 +30,7 @@ import (
 	"github.com/berachain/beacon-kit/node-core/components/storage"
 	"github.com/berachain/beacon-kit/storage/beacondb"
 	"github.com/berachain/beacon-kit/storage/block"
-	depositdb "github.com/berachain/beacon-kit/storage/deposit"
+	"github.com/berachain/beacon-kit/storage/deposit"
 )
 
 // StorageBackendInput is the input for the ProvideStorageBackend function.
@@ -39,7 +39,7 @@ type StorageBackendInput struct {
 	AvailabilityStore *dastore.Store
 	BlockStore        *block.KVStore[*types.BeaconBlock]
 	ChainSpec         chain.Spec
-	DepositStore      *depositdb.KVStore
+	DepositStore      deposit.Store
 	BeaconStore       *beacondb.KVStore
 	Logger            *phuslu.Logger
 	TelemetrySink     *metrics.TelemetrySink

node-core/components/deposit_store.go

@@ -27,7 +27,8 @@ import (
 	"github.com/berachain/beacon-kit/config"
 	"github.com/berachain/beacon-kit/log/phuslu"
 	"github.com/berachain/beacon-kit/node-core/components/storage"
-	depositstore "github.com/berachain/beacon-kit/storage/deposit"
+	"github.com/berachain/beacon-kit/storage/deposit"
+	depositstorev1 "github.com/berachain/beacon-kit/storage/deposit/v1"
 	dbm "github.com/cosmos/cosmos-db"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cast"
@@ -40,24 +41,31 @@ type DepositStoreInput struct {
 	AppOpts config.AppOptions
 }
 
-// ProvideDepositStore is a function that provides the module to the
-// application.
-func ProvideDepositStore(in DepositStoreInput) (*depositstore.KVStore, error) {
+// ProvideDepositStore is a function that provides the module to the application.
+func ProvideDepositStore(in DepositStoreInput) (deposit.Store, error) {
 	var (
 		rootDir = cast.ToString(in.AppOpts.Get(flags.FlagHome))
 		dataDir = filepath.Join(rootDir, "data")
-		name    = "deposits"
+		nameV1  = "deposits"
+		nameV2  = "depositsV2"
 	)
 
-	pdb, err := dbm.NewDB(name, dbm.PebbleDBBackend, dataDir)
+	dbV1, err := dbm.NewDB(nameV1, dbm.PebbleDBBackend, dataDir)
 	if err != nil {
 		return nil, err
 	}
-	spdb := depositstore.NewSynced(pdb)
+	spdbV1 := depositstorev1.NewSynced(dbV1)
 
-	return depositstore.NewStore(
-		storage.NewKVStoreProvider(spdb),
-		spdb.Close,
+	dbV2, err := dbm.NewDB(nameV2, dbm.PebbleDBBackend, dataDir)
+	if err != nil {
+		return nil, err
+	}
+
+	return deposit.NewStore(
+		nil,
+		storage.NewKVStoreProvider(spdbV1),
+		spdbV1.Close,
+		dbV2,
 		in.Logger.With("service", "deposit-store"),
 	), nil
 }

node-core/components/interfaces.go

@@ -40,7 +40,7 @@ import (
 	"github.com/berachain/beacon-kit/state-transition/core"
 	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
 	"github.com/berachain/beacon-kit/storage/block"
-	depositdb "github.com/berachain/beacon-kit/storage/deposit"
+	"github.com/berachain/beacon-kit/storage/deposit"
 )
 
 type (
@@ -163,7 +163,7 @@ type (
 	StorageBackend interface {
 		AvailabilityStore() *dastore.Store
 		BlockStore() *block.KVStore[*ctypes.BeaconBlock]
-		DepositStore() *depositdb.KVStore
+		DepositStore() deposit.Store
 		// StateFromContext retrieves the beacon state from the given context.
 		StateFromContext(context.Context) *statedb.StateDB
 	}

node-core/components/state_processor.go

@@ -28,7 +28,7 @@ import (
 	"github.com/berachain/beacon-kit/node-core/components/metrics"
 	"github.com/berachain/beacon-kit/primitives/crypto"
 	"github.com/berachain/beacon-kit/state-transition/core"
-	depositdb "github.com/berachain/beacon-kit/storage/deposit"
+	"github.com/berachain/beacon-kit/storage/deposit"
 )
 
 // StateProcessorInput is the input for the state processor for the depinject
@@ -38,7 +38,7 @@ type StateProcessorInput struct {
 	Logger          *phuslu.Logger
 	ChainSpec       chain.Spec
 	ExecutionEngine *engine.Engine
-	DepositStore    *depositdb.KVStore
+	DepositStore    deposit.Store
 	Signer          crypto.BLSSigner
 	TelemetrySink   *metrics.TelemetrySink
 }

node-core/components/storage/storage.go

@@ -30,7 +30,7 @@ import (
 	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
 	"github.com/berachain/beacon-kit/storage/beacondb"
 	"github.com/berachain/beacon-kit/storage/block"
-	depositdb "github.com/berachain/beacon-kit/storage/deposit"
+	"github.com/berachain/beacon-kit/storage/deposit"
 )
 
 // Backend is a struct that holds the storage backend. It provides a simple
@@ -39,7 +39,7 @@ type Backend struct {
 	chainSpec         chain.Spec
 	availabilityStore *dastore.Store
 	kvStore           *beacondb.KVStore
-	depositStore      *depositdb.KVStore
+	depositStore      deposit.Store
 	blockStore        *block.KVStore[*types.BeaconBlock]
 	logger            log.Logger
 	telemetrySink     statedb.TelemetrySink
@@ -49,7 +49,7 @@ func NewBackend(
 	chainSpec chain.Spec,
 	availabilityStore *dastore.Store,
 	kvStore *beacondb.KVStore,
-	depositStore *depositdb.KVStore,
+	depositStore deposit.Store,
 	blockStore *block.KVStore[*types.BeaconBlock],
 	logger log.Logger,
 	telemetrySink statedb.TelemetrySink,
@@ -92,6 +92,6 @@ func (k Backend) BlockStore() *block.KVStore[*types.BeaconBlock] {
 }
 
 // DepositStore returns the deposit store struct initialized with a.
-func (k Backend) DepositStore() *depositdb.KVStore {
+func (k Backend) DepositStore() deposit.Store {
 	return k.depositStore
 }

state-transition/core/state_processor.go

@@ -33,7 +33,7 @@ import (
 	"github.com/berachain/beacon-kit/primitives/math"
 	"github.com/berachain/beacon-kit/primitives/transition"
 	"github.com/berachain/beacon-kit/state-transition/core/state"
-	depositdb "github.com/berachain/beacon-kit/storage/deposit"
+	"github.com/berachain/beacon-kit/storage/deposit"
 )
 
 // StateProcessor is a basic Processor, which takes care of the
@@ -52,7 +52,7 @@ type StateProcessor struct {
 	// executionEngine is the engine responsible for executing transactions.
 	executionEngine ExecutionEngine
 	// ds allows checking payload deposits against the deposit contract
-	ds *depositdb.KVStore
+	ds deposit.Store
 	// metrics is the metrics for the service.
 	metrics *stateProcessorMetrics
 	// logDeneb1Once enforces logging the Deneb1 fork information at most once.
@@ -64,7 +64,7 @@ func NewStateProcessor(
 	logger log.Logger,
 	cs ChainSpec,
 	executionEngine ExecutionEngine,
-	ds *depositdb.KVStore,
+	ds deposit.Store,
 	signer crypto.BLSSigner,
 	fGetAddressFromPubKey func(crypto.BLSPubkey) ([]byte, error),
 	telemetrySink TelemetrySink,

state-transition/core/validation_deposits.go

@@ -29,7 +29,7 @@ import (
 	"github.com/berachain/beacon-kit/primitives/constants"
 	"github.com/berachain/beacon-kit/primitives/math"
 	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
-	depositdb "github.com/berachain/beacon-kit/storage/deposit"
+	"github.com/berachain/beacon-kit/storage/deposit"
 )
 
 func validateGenesisDeposits(
@@ -73,7 +73,7 @@ func validateGenesisDeposits(
 func ValidateNonGenesisDeposits(
 	ctx context.Context,
 	st *statedb.StateDB,
-	depositStore *depositdb.KVStore,
+	depositStore deposit.Store,
 	maxDepositsPerBlock uint64,
 	blkDeposits []*ctypes.Deposit,
 	blkDepositRoot common.Root,
@@ -84,7 +84,7 @@ func ValidateNonGenesisDeposits(
 	}
 
 	// Grab all previous deposits from genesis up to the current index + max deposits per block.
-	localDeposits, err := depositStore.GetDepositsByIndex(
+	localDeposits, _, err := depositStore.GetDepositsByIndex(
 		ctx,
 		constants.FirstDepositIndex,
 		depositIndex+maxDepositsPerBlock,