refactor(server/v2): clean up storage use and config

server/v2/cometbft/server.go

@@ -43,14 +43,21 @@ type CometBFTServer[T transaction.Tx] struct {
 
 	initTxCodec   transaction.Codec[T]
 	logger        log.Logger
+	store         types.Store
 	serverOptions ServerOptions[T]
 	config        Config
 	cfgOptions    []CfgOption
 }
 
-func New[T transaction.Tx](txCodec transaction.Codec[T], serverOptions ServerOptions[T], cfgOptions ...CfgOption) *CometBFTServer[T] {
+func New[T transaction.Tx](
+	txCodec transaction.Codec[T],
+	store types.Store,
+	serverOptions ServerOptions[T],
+	cfgOptions ...CfgOption,
+) *CometBFTServer[T] {
 	return &CometBFTServer[T]{
 		initTxCodec:   txCodec,
+		store:         store,
 		serverOptions: serverOptions,
 		cfgOptions:    cfgOptions,
 	}
@@ -98,15 +105,14 @@ func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logg
 	}
 
 	s.logger = logger.With(log.ModuleKey, s.Name())
-	store := appI.GetStore().(types.Store)
 	consensus := NewConsensus(
 		s.logger,
 		appI.Name(),
 		appI.GetAppManager(),
 		s.serverOptions.Mempool(cfg),
 		indexEvents,
 		appI.GetGPRCMethodsToMessageMap(),
-		store,
+		s.store,
 		s.config,
 		s.initTxCodec,
 		chainID,
@@ -118,8 +124,8 @@ func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logg
 	consensus.addrPeerFilter = s.serverOptions.AddrPeerFilter
 	consensus.idPeerFilter = s.serverOptions.IdPeerFilter
 
-	ss := store.GetStateStorage().(snapshots.StorageSnapshotter)
-	sc := store.GetStateCommitment().(snapshots.CommitSnapshotter)
+	ss := s.store.GetStateStorage().(snapshots.StorageSnapshotter)
+	sc := s.store.GetStateCommitment().(snapshots.CommitSnapshotter)
 
 	snapshotStore, err := GetSnapshotStore(s.config.ConfigTomlConfig.RootDir)
 	if err != nil {

server/v2/cometbft/types/store.go

@@ -7,6 +7,8 @@ import (
 )
 
 type Store interface {
+	storev2.Backend
+
 	// GetLatestVersion returns the latest version that consensus has been made on
 	GetLatestVersion() (uint64, error)
 	// StateLatest returns a readonly view over the latest
@@ -30,10 +32,4 @@ type Store interface {
 
 	// LastCommitID returns a CommitID pertaining to the last commitment.
 	LastCommitID() (proof.CommitID, error)
-
-	// GetStateStorage returns the SS backend.
-	GetStateStorage() storev2.VersionedDatabase
-
-	// GetStateCommitment returns the SC backend.
-	GetStateCommitment() storev2.Committer
 }

server/v2/commands.go

@@ -33,7 +33,7 @@ func Execute(rootCmd *cobra.Command, envPrefix, defaultHome string) error {
 }
 
 // AddCommands add the server commands to the root command
-// It configure the config handling and the logger handling
+// It configures the config handling and the logger handling
 func AddCommands[T transaction.Tx](
 	rootCmd *cobra.Command,
 	newApp AppCreator[T],

server/v2/server_test.go

@@ -63,7 +63,7 @@ func TestServer(t *testing.T) {
 	err = grpcServer.Init(&mockApp[transaction.Tx]{}, cfg, logger)
 	require.NoError(t, err)
 
-	storeServer := store.New[transaction.Tx](nil /* nil appCreator as not using CLI commands */)
+	storeServer := store.New[transaction.Tx](nil /* nil store is not using CLI commands */)
 	err = storeServer.Init(&mockApp[transaction.Tx]{}, cfg, logger)
 	require.NoError(t, err)
 

server/v2/store/server.go

@@ -9,6 +9,7 @@ import (
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/log"
 	serverv2 "cosmossdk.io/server/v2"
+	storev2 "cosmossdk.io/store/v2"
 )
 
 var (
@@ -22,15 +23,14 @@ const ServerName = "store"
 // Server manages store config and contains prune & snapshot commands
 type Server[T transaction.Tx] struct {
 	config *Config
-	// saving appCreator for only RestoreSnapshotCmd
-	appCreator serverv2.AppCreator[T]
+	store  storev2.Backend
 }
 
-func New[T transaction.Tx](appCreator serverv2.AppCreator[T]) *Server[T] {
-	return &Server[T]{appCreator: appCreator}
+func New[T transaction.Tx](store storev2.Backend) *Server[T] {
+	return &Server[T]{store: store}
 }
 
-func (s *Server[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logger log.Logger) error {
+func (s *Server[T]) Init(_ serverv2.AppI[T], cfg map[string]any, _ log.Logger) error {
 	serverCfg := s.Config().(*Config)
 	if len(cfg) > 0 {
 		if err := serverv2.UnmarshalSubConfig(cfg, s.Name(), &serverCfg); err != nil {
@@ -46,11 +46,11 @@ func (s *Server[T]) Name() string {
 	return ServerName
 }
 
-func (s *Server[T]) Start(ctx context.Context) error {
+func (s *Server[T]) Start(context.Context) error {
 	return nil
 }
 
-func (s *Server[T]) Stop(ctx context.Context) error {
+func (s *Server[T]) Stop(context.Context) error {
 	return nil
 }
 
@@ -63,7 +63,7 @@ func (s *Server[T]) CLICommands() serverv2.CLIConfig {
 			s.ListSnapshotsCmd(),
 			s.DumpArchiveCmd(),
 			s.LoadArchiveCmd(),
-			s.RestoreSnapshotCmd(s.appCreator),
+			s.RestoreSnapshotCmd(s.store),
 		},
 	}
 }

server/v2/store/snapshot.go

@@ -76,7 +76,7 @@ func (s *Server[T]) ExportSnapshotCmd() *cobra.Command {
 }
 
 // RestoreSnapshotCmd returns a command to restore a snapshot
-func (s *Server[T]) RestoreSnapshotCmd(newApp serverv2.AppCreator[T]) *cobra.Command {
+func (s *Server[T]) RestoreSnapshotCmd(rootStore storev2.Backend) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "restore <height> <format>",
 		Short: "Restore app state from local snapshot",
@@ -95,8 +95,6 @@ func (s *Server[T]) RestoreSnapshotCmd(newApp serverv2.AppCreator[T]) *cobra.Com
 			}
 
 			logger := log.NewLogger(cmd.OutOrStdout())
-			app := newApp(logger, v)
-			rootStore := app.GetStore().(storev2.RootStore)
 
 			sm, err := createSnapshotsManager(cmd, v, logger, rootStore)
 			if err != nil {
@@ -350,7 +348,9 @@ func (s *Server[T]) LoadArchiveCmd() *cobra.Command {
 	}
 }
 
-func createSnapshotsManager(cmd *cobra.Command, v *viper.Viper, logger log.Logger, store storev2.RootStore) (*snapshots.Manager, error) {
+func createSnapshotsManager(
+	cmd *cobra.Command, v *viper.Viper, logger log.Logger, store storev2.Backend,
+) (*snapshots.Manager, error) {
 	home := v.GetString(serverv2.FlagHome)
 	snapshotStore, err := snapshots.NewStore(filepath.Join(home, "data", "snapshots"))
 	if err != nil {
@@ -371,7 +371,11 @@ func createSnapshotsManager(cmd *cobra.Command, v *viper.Viper, logger log.Logge
 		}
 	}
 
-	sm := snapshots.NewManager(snapshotStore, snapshots.NewSnapshotOptions(interval, uint32(keepRecent)), store.GetStateCommitment().(snapshots.CommitSnapshotter), store.GetStateStorage().(snapshots.StorageSnapshotter), nil, logger)
+	sm := snapshots.NewManager(
+		snapshotStore, snapshots.NewSnapshotOptions(interval, uint32(keepRecent)),
+		store.GetStateCommitment().(snapshots.CommitSnapshotter),
+		store.GetStateStorage().(snapshots.StorageSnapshotter),
+		nil, logger)
 	return sm, nil
 }
 

server/v2/types.go

@@ -17,5 +17,4 @@ type AppI[T transaction.Tx] interface {
 	InterfaceRegistry() server.InterfaceRegistry
 	GetAppManager() *appmanager.AppManager[T]
 	GetGPRCMethodsToMessageMap() map[string]func() gogoproto.Message
-	GetStore() any
 }

simapp/v2/simdv2/cmd/commands.go

@@ -17,7 +17,8 @@ import (
 	"cosmossdk.io/server/v2/api/grpc"
 	"cosmossdk.io/server/v2/api/telemetry"
 	"cosmossdk.io/server/v2/cometbft"
-	"cosmossdk.io/server/v2/store"
+	cometbfttypes "cosmossdk.io/server/v2/cometbft/types"
+	serverstore "cosmossdk.io/server/v2/store"
 	"cosmossdk.io/simapp/v2"
 	confixcmd "cosmossdk.io/tools/confix/cmd"
 
@@ -43,6 +44,7 @@ func newApp[T transaction.Tx](logger log.Logger, viper *viper.Viper) serverv2.Ap
 func initRootCmd[T transaction.Tx](
 	rootCmd *cobra.Command,
 	txConfig client.TxConfig,
+	store cometbfttypes.Store,
 	moduleManager *runtimev2.MM[T],
 ) {
 	cfg := sdk.GetConfig()
@@ -77,11 +79,12 @@ func initRootCmd[T transaction.Tx](
 		initServerConfig(),
 		cometbft.New(
 			&genericTxDecoder[T]{txConfig},
+			store,
 			initCometOptions[T](),
 			initCometConfig(),
 		),
 		grpc.New[T](),
-		store.New[T](newApp),
+		serverstore.New[T](store),
 		telemetry.New[T](),
 	); err != nil {
 		panic(err)

simapp/v2/simdv2/cmd/root_di.go

@@ -32,6 +32,7 @@ func NewRootCmd[T transaction.Tx]() *cobra.Command {
 		autoCliOpts   autocli.AppOptions
 		moduleManager *runtime.MM[T]
 		clientCtx     client.Context
+		storeBuilder  runtime.StoreBuilder
 	)
 
 	if err := depinject.Inject(
@@ -51,6 +52,7 @@ func NewRootCmd[T transaction.Tx]() *cobra.Command {
 				std.RegisterLegacyAminoCodec,
 			),
 		),
+		&storeBuilder,
 		&autoCliOpts,
 		&moduleManager,
 		&clientCtx,
@@ -83,7 +85,8 @@ func NewRootCmd[T transaction.Tx]() *cobra.Command {
 		},
 	}
 
-	initRootCmd(rootCmd, clientCtx.TxConfig, moduleManager)
+	store := storeBuilder.Get()
+	initRootCmd(rootCmd, clientCtx.TxConfig, store, moduleManager)
 
 	nodeCmds := nodeservice.NewNodeCommands()
 	autoCliOpts.ModuleOptions = make(map[string]*autocliv1.ModuleOptions)

store/v2/store.go

@@ -12,6 +12,9 @@ import (
 // RootStore defines an abstraction layer containing a State Storage (SS) engine
 // and one or more State Commitment (SC) engines.
 type RootStore interface {
+	Pruner
+	Backend
+
 	// StateLatest returns a read-only version of the RootStore at the latest
 	// height, alongside the associated version.
 	StateLatest() (uint64, corestore.ReaderMap, error)
@@ -21,12 +24,6 @@ type RootStore interface {
 	// an error must be returned.
 	StateAt(version uint64) (corestore.ReaderMap, error)
 
-	// GetStateStorage returns the SS backend.
-	GetStateStorage() VersionedDatabase
-
-	// GetStateCommitment returns the SC backend.
-	GetStateCommitment() Committer
-
 	// Query performs a query on the RootStore for a given store key, version (height),
 	// and key tuple. Queries should be routed to the underlying SS engine.
 	Query(storeKey []byte, version uint64, key []byte, prove bool) (QueryResult, error)
@@ -67,11 +64,18 @@ type RootStore interface {
 	// SetMetrics sets the telemetry handler on the RootStore.
 	SetMetrics(m metrics.Metrics)
 
-	Prune(version uint64) error
-
 	io.Closer
 }
 
+// Backend defines the interface for the RootStore backends.
+type Backend interface {
+	// GetStateStorage returns the SS backend.
+	GetStateStorage() VersionedDatabase
+
+	// GetStateCommitment returns the SC backend.
+	GetStateCommitment() Committer
+}
+
 // UpgradeableStore defines the interface for upgrading store keys.
 type UpgradeableStore interface {
 	// LoadVersionAndUpgrade behaves identically to LoadVersion except it also