refactor(server/v2): eager config loading

client/v2/helpers/home.go

@@ -46,3 +46,27 @@ func GetNodeHomeDirectory(name string) (string, error) {
 
 	return filepath.Join(userHomeDir, name), nil
 }
+
+func DefaultHomeDir(name string) (string, error) {
+	// get the home directory from the environment variable
+	// to not clash with the $HOME system variable, when no prefix is set
+	// we check the NODE_HOME environment variable
+	envPrefix := EnvPrefix
+	homeDir, envHome := "", "HOME"
+	if len(envPrefix) > 0 {
+		homeDir = os.Getenv(envPrefix + "_" + envHome)
+	} else {
+		homeDir = os.Getenv("NODE_" + envHome)
+	}
+	if homeDir != "" {
+		return filepath.Clean(homeDir), nil
+	}
+
+	// get user home directory
+	userHomeDir, err := os.UserHomeDir()
+	if err != nil {
+		return "", err
+	}
+
+	return filepath.Join(userHomeDir, name), nil
+}

core/server/config.go

@@ -6,3 +6,16 @@ type DynamicConfig interface {
 	Get(string) any
 	GetString(string) string
 }
+
+type ConfigMap map[string]any
+
+func (c ConfigMap) Get(s string) any {
+	return c[s]
+}
+
+type ModuleConfigMap struct {
+	Module string
+	Config ConfigMap
+}
+
+func (ModuleConfigMap) IsManyPerContainerType() {}

go.mod

@@ -185,6 +185,7 @@ require (
 replace (
 	cosmossdk.io/api => ./api
 	cosmossdk.io/collections => ./collections
+	cosmossdk.io/core => ./core
 	cosmossdk.io/store => ./store
 	cosmossdk.io/x/bank => ./x/bank
 	cosmossdk.io/x/staking => ./x/staking

go.sum

@@ -4,8 +4,6 @@ buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.1-20240130113600-88e
 buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.1-20240130113600-88ef6483f90f.1/go.mod h1:zqi/LZjZhyvjCMTEVIwAf5VRlkLduuCfqmZxgoormq0=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cosmossdk.io/core v1.0.0-alpha.4 h1:9iuroT9ejDYETCsGkzkvs/wAY/5UFl7nCIINFRxyMJY=
-cosmossdk.io/core v1.0.0-alpha.4/go.mod h1:3u9cWq1FAVtiiCrDPpo4LhR+9V6k/ycSG4/Y/tREWCY=
 cosmossdk.io/core/testing v0.0.0-20240923163230-04da382a9f29 h1:NxxUo0GMJUbIuVg0R70e3cbn9eFTEuMr7ev1AFvypdY=
 cosmossdk.io/core/testing v0.0.0-20240923163230-04da382a9f29/go.mod h1:8s2tPeJtSiQuoyPmr2Ag7meikonISO4Fv4MoO8+ORrs=
 cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=

runtime/v2/builder.go

@@ -24,6 +24,7 @@ import (
 type AppBuilder[T transaction.Tx] struct {
 	app          *App[T]
 	storeBuilder root.Builder
+	storeConfig  *root.Config
 
 	// the following fields are used to overwrite the default
 	branch      func(state store.ReaderMap) store.WriterMap
@@ -82,12 +83,13 @@ func (a *AppBuilder[T]) Build(opts ...AppBuilderOption[T]) (*App[T], error) {
 		}
 	}
 
-	a.app.db = a.storeBuilder.Get()
-	if a.app.db == nil {
-		return nil, fmt.Errorf("storeBuilder did not return a db")
+	var err error
+	a.app.db, err = a.storeBuilder.Build(a.app.logger, a.storeConfig)
+	if err != nil {
+		return nil, err
 	}
 
-	if err := a.app.moduleManager.RegisterServices(a.app); err != nil {
+	if err = a.app.moduleManager.RegisterServices(a.app); err != nil {
 		return nil, err
 	}
 

runtime/v2/go.mod

@@ -9,6 +9,7 @@ replace (
 	cosmossdk.io/server/v2/stf => ../../server/v2/stf
 	cosmossdk.io/store/v2 => ../../store/v2
 	cosmossdk.io/x/tx => ../../x/tx
+	cosmossdk.io/core => ../../core
 )
 
 require (

runtime/v2/module.go

@@ -108,6 +108,7 @@ func ProvideAppBuilder[T transaction.Tx](
 	interfaceRegistrar registry.InterfaceRegistrar,
 	amino registry.AminoRegistrar,
 	storeBuilder root.Builder,
+	storeConfig *root.Config,
 ) (
 	*AppBuilder[T],
 	*stf.MsgRouterBuilder,
@@ -134,14 +135,15 @@ func ProvideAppBuilder[T transaction.Tx](
 		queryHandlers:      map[string]appmodulev2.Handler{},
 		storeLoader:        DefaultStoreLoader,
 	}
-	appBuilder := &AppBuilder[T]{app: app, storeBuilder: storeBuilder}
+	appBuilder := &AppBuilder[T]{app: app, storeBuilder: storeBuilder, storeConfig: storeConfig}
 
 	return appBuilder, msgRouterBuilder, appModule[T]{app}, protoFiles, protoTypes
 }
 
 type AppInputs struct {
 	depinject.In
 
+	StoreConfig        *root.Config
 	Config             *runtimev2.Module
 	AppBuilder         *AppBuilder[transaction.Tx]
 	ModuleManager      *MM[transaction.Tx]

server/v2/api/telemetry/server.go

@@ -2,6 +2,7 @@ package telemetry
 
 import (
 	"context"
+	"cosmossdk.io/core/server"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -27,8 +28,23 @@ type Server[T transaction.Tx] struct {
 }
 
 // New creates a new telemetry server.
-func New[T transaction.Tx]() *Server[T] {
-	return &Server[T]{}
+func New[T transaction.Tx](cfg server.ConfigMap, logger log.Logger) (*Server[T], error) {
+	srv := &Server[T]{}
+	serverCfg := srv.Config().(*Config)
+	if len(cfg) > 0 {
+		if err := serverv2.UnmarshalSubConfig(cfg, srv.Name(), &serverCfg); err != nil {
+			return nil, fmt.Errorf("failed to unmarshal config: %w", err)
+		}
+	}
+	srv.config = serverCfg
+	srv.logger = logger.With(log.ModuleKey, srv.Name())
+
+	metrics, err := NewMetrics(srv.config)
+	if err != nil {
+		return nil, fmt.Errorf("failed to initialize metrics: %w", err)
+	}
+	srv.metrics = metrics
+	return srv, nil
 }
 
 // Name returns the server name.
@@ -46,21 +62,6 @@ func (s *Server[T]) Config() any {
 
 // Init implements serverv2.ServerComponent.
 func (s *Server[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logger log.Logger) error {
-	serverCfg := s.Config().(*Config)
-	if len(cfg) > 0 {
-		if err := serverv2.UnmarshalSubConfig(cfg, s.Name(), &serverCfg); err != nil {
-			return fmt.Errorf("failed to unmarshal config: %w", err)
-		}
-	}
-	s.config = serverCfg
-	s.logger = logger.With(log.ModuleKey, s.Name())
-
-	metrics, err := NewMetrics(s.config)
-	if err != nil {
-		return fmt.Errorf("failed to initialize metrics: %w", err)
-	}
-	s.metrics = metrics
-
 	return nil
 }
 

server/v2/cometbft/go.mod

@@ -13,6 +13,7 @@ replace (
 	cosmossdk.io/x/consensus => ../../../x/consensus
 	cosmossdk.io/x/staking => ../../../x/staking
 	cosmossdk.io/x/tx => ../../../x/tx
+	cosmossdk.io/core => ../../../core
 	github.com/cosmos/cosmos-sdk => ../../../
 )
 

server/v2/cometbft/server.go

@@ -2,6 +2,10 @@ package cometbft
 
 import (
 	"context"
+	appmodulev2 "cosmossdk.io/core/appmodule/v2"
+	"cosmossdk.io/core/server"
+	"cosmossdk.io/server/v2/appmanager"
+	"cosmossdk.io/server/v2/cometbft/types"
 	"crypto/sha256"
 	"encoding/json"
 	"fmt"
@@ -49,34 +53,38 @@ type CometBFTServer[T transaction.Tx] struct {
 }
 
 func New[T transaction.Tx](
+	logger log.Logger,
+	appName string,
+	store types.Store,
+	appManager *appmanager.AppManager[T],
+	queryHandlers map[string]appmodulev2.Handler,
 	txCodec transaction.Codec[T],
+	cfg server.ConfigMap,
 	serverOptions ServerOptions[T],
 	cfgOptions ...CfgOption,
-) *CometBFTServer[T] {
-	return &CometBFTServer[T]{
+) (*CometBFTServer[T], error) {
+	srv := &CometBFTServer[T]{
 		initTxCodec:   txCodec,
 		serverOptions: serverOptions,
 		cfgOptions:    cfgOptions,
 	}
-}
 
-func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logger log.Logger) error {
 	home, _ := cfg[serverv2.FlagHome].(string)
 
 	// get configs (app.toml + config.toml) from viper
-	appTomlConfig := s.Config().(*AppTomlConfig)
+	appTomlConfig := srv.Config().(*AppTomlConfig)
 	configTomlConfig := cmtcfg.DefaultConfig().SetRoot(home)
 	if len(cfg) > 0 {
-		if err := serverv2.UnmarshalSubConfig(cfg, s.Name(), &appTomlConfig); err != nil {
-			return fmt.Errorf("failed to unmarshal config: %w", err)
+		if err := serverv2.UnmarshalSubConfig(cfg, srv.Name(), &appTomlConfig); err != nil {
+			return nil, fmt.Errorf("failed to unmarshal config: %w", err)
 		}
 
 		if err := serverv2.UnmarshalSubConfig(cfg, "", &configTomlConfig); err != nil {
-			return fmt.Errorf("failed to unmarshal config: %w", err)
+			return nil, fmt.Errorf("failed to unmarshal config: %w", err)
 		}
 	}
 
-	s.config = Config{
+	srv.config = Config{
 		ConfigTomlConfig: configTomlConfig,
 		AppTomlConfig:    appTomlConfig,
 	}
@@ -96,42 +104,44 @@ func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logg
 		}
 	}
 
-	indexEvents := make(map[string]struct{}, len(s.config.AppTomlConfig.IndexEvents))
-	for _, e := range s.config.AppTomlConfig.IndexEvents {
+	indexEvents := make(map[string]struct{}, len(srv.config.AppTomlConfig.IndexEvents))
+	for _, e := range srv.config.AppTomlConfig.IndexEvents {
 		indexEvents[e] = struct{}{}
 	}
 
-	s.logger = logger.With(log.ModuleKey, s.Name())
-	rs := appI.Store()
+	srv.logger = logger.With(log.ModuleKey, srv.Name())
 	consensus := NewConsensus(
-		s.logger,
-		appI.Name(),
-		appI,
-		appI.Close,
-		s.serverOptions.Mempool(cfg),
+		logger,
+		appName,
+		appManager,
+		nil,
+		srv.serverOptions.Mempool(cfg),
 		indexEvents,
-		appI.QueryHandlers(),
-		rs,
-		s.config,
-		s.initTxCodec,
+		queryHandlers,
+		store,
+		srv.config,
+		srv.initTxCodec,
 		chainID,
 	)
-	consensus.prepareProposalHandler = s.serverOptions.PrepareProposalHandler
-	consensus.processProposalHandler = s.serverOptions.ProcessProposalHandler
-	consensus.checkTxHandler = s.serverOptions.CheckTxHandler
-	consensus.verifyVoteExt = s.serverOptions.VerifyVoteExtensionHandler
-	consensus.extendVote = s.serverOptions.ExtendVoteHandler
-	consensus.addrPeerFilter = s.serverOptions.AddrPeerFilter
-	consensus.idPeerFilter = s.serverOptions.IdPeerFilter
-
-	ss := rs.GetStateStorage().(snapshots.StorageSnapshotter)
-	sc := rs.GetStateCommitment().(snapshots.CommitSnapshotter)
-
-	snapshotStore, err := GetSnapshotStore(s.config.ConfigTomlConfig.RootDir)
+	consensus.prepareProposalHandler = srv.serverOptions.PrepareProposalHandler
+	consensus.processProposalHandler = srv.serverOptions.ProcessProposalHandler
+	consensus.checkTxHandler = srv.serverOptions.CheckTxHandler
+	consensus.verifyVoteExt = srv.serverOptions.VerifyVoteExtensionHandler
+	consensus.extendVote = srv.serverOptions.ExtendVoteHandler
+	consensus.addrPeerFilter = srv.serverOptions.AddrPeerFilter
+	consensus.idPeerFilter = srv.serverOptions.IdPeerFilter
+
+	ss := store.GetStateStorage().(snapshots.StorageSnapshotter)
+	sc := store.GetStateCommitment().(snapshots.CommitSnapshotter)
+
+	snapshotStore, err := GetSnapshotStore(srv.config.ConfigTomlConfig.RootDir)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	consensus.snapshotManager = snapshots.NewManager(snapshotStore, s.serverOptions.SnapshotOptions(cfg), sc, ss, nil, s.logger)
+	consensus.snapshotManager = snapshots.NewManager(
+		snapshotStore, srv.serverOptions.SnapshotOptions(cfg), sc, ss, nil, logger)
+
+	srv.Consensus = consensus
 
 	// initialize the indexer
 	if indexerCfg := s.config.AppTomlConfig.Indexer; len(indexerCfg.Target) > 0 {
@@ -148,6 +158,10 @@ func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logg
 
 	s.Consensus = consensus
 
+	return srv, nil
+	}
+
+func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], cfg map[string]any, logger log.Logger) error {
 	return nil
 }