feat(server/v2): add config & start helper

runtime/v2/app.go

@@ -127,10 +127,6 @@ func (a *App) ExecuteGenesisTx(_ []byte) error {
 	panic("App.ExecuteGenesisTx not supported in runtime/v2")
 }
 
-func (a *App) SetAppVersion(context.Context, uint64) error {
-	return nil
-}
-
-func (a *App) AppVersion(context.Context) (uint64, error) {
-	return 0, nil
+func (a *App) GetAppManager() *appmanager.AppManager[transaction.Tx] {
+	return a.AppManager
 }

scripts/simapp-v2-init.sh

@@ -13,13 +13,12 @@ CONFIG="${CONFIG:-$HOME/.simappv2/config}"
 cd "$SIMAPP_DIR"
 go build -o "$ROOT/build/simdv2" simdv2/main.go
 
+if [ -d "$($SIMD config home)" ]; then rm -r $($SIMD config home); fi
+
 $SIMD init simapp-v2-node --chain-id simapp-v2-chain
 
 cd "$CONFIG"
 
-# to enable the api server
-$SIMD config set app api.enable true
-
 # to change the voting_period
 jq '.app_state.gov.voting_params.voting_period = "600s"' genesis.json > temp.json && mv temp.json genesis.json
 

server/v2/api/grpc/server.go

@@ -15,27 +15,33 @@ import (
 
 	_ "cosmossdk.io/api/amino" // Import amino.proto file for reflection
 	appmanager "cosmossdk.io/core/app"
+	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/log"
+	serverv2 "cosmossdk.io/server/v2"
 	"cosmossdk.io/server/v2/api/grpc/gogoreflection"
 )
 
 const serverName = "grpc-server"
 
 type GRPCServer struct {
 	logger log.Logger
+	config *Config
 
 	grpcSrv *grpc.Server
-	config  *Config
 }
 
 type GRPCService interface {
 	// RegisterGRPCServer registers gRPC services directly with the gRPC server.
 	RegisterGRPCServer(gogogrpc.Server)
 }
 
-// New returns a correctly configured and initialized gRPC server.
+func New() GRPCServer {
+	return GRPCServer{}
+}
+
+// Init returns a correctly configured and initialized gRPC server.
 // Note, the caller is responsible for starting the server.
-func New(logger log.Logger, v *viper.Viper, interfaceRegistry appmanager.InterfaceRegistry, app GRPCService) (GRPCServer, error) {
+func (g GRPCServer) Init(appI serverv2.AppI[transaction.Tx], v *viper.Viper, logger log.Logger) (serverv2.ServerComponent[transaction.Tx], error) {
 	cfg := DefaultConfig()
 	if v != nil {
 		if err := v.Sub(serverName).Unmarshal(&cfg); err != nil {
@@ -44,12 +50,12 @@ func New(logger log.Logger, v *viper.Viper, interfaceRegistry appmanager.Interfa
 	}
 
 	grpcSrv := grpc.NewServer(
-		grpc.ForceServerCodec(newProtoCodec(interfaceRegistry).GRPCCodec()),
+		grpc.ForceServerCodec(newProtoCodec(appI.InterfaceRegistry()).GRPCCodec()),
 		grpc.MaxSendMsgSize(cfg.MaxSendMsgSize),
 		grpc.MaxRecvMsgSize(cfg.MaxRecvMsgSize),
 	)
 
-	app.RegisterGRPCServer(grpcSrv)
+	// appI.RegisterGRPCServer(grpcSrv)
 
 	// Reflection allows external clients to see what services and methods
 	// the gRPC server exposes.

server/v2/cometbft/config.go

@@ -2,11 +2,24 @@ package cometbft
 
 import (
 	cmtcfg "github.com/cometbft/cometbft/config"
+	"github.com/spf13/viper"
 
+	serverv2 "cosmossdk.io/server/v2"
 	"cosmossdk.io/server/v2/api/grpc"
 	"cosmossdk.io/server/v2/cometbft/types"
 )
 
+func GetConfigFromViper(v *viper.Viper) *cmtcfg.Config {
+	conf := cmtcfg.DefaultConfig()
+	err := v.Unmarshal(conf)
+	rootDir := v.GetString(serverv2.FlagHome)
+	if err != nil {
+		return cmtcfg.DefaultConfig().SetRoot(rootDir)
+	}
+
+	return conf.SetRoot(rootDir)
+}
+
 // Config is the configuration for the CometBFT application
 type Config struct {
 	// app.toml config options

server/v2/cometbft/go.mod

@@ -7,6 +7,7 @@ replace (
 	cosmossdk.io/core => ../../../core
 	cosmossdk.io/core/testing => ../../../core/testing
 	cosmossdk.io/depinject => ../../../depinject
+	cosmossdk.io/log => ../../../log
 	cosmossdk.io/server/v2 => ../
 	cosmossdk.io/server/v2/appmanager => ../appmanager
 	cosmossdk.io/store => ../../../store
@@ -38,6 +39,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
+	github.com/spf13/viper v1.19.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237
 	google.golang.org/grpc v1.64.0
 	google.golang.org/protobuf v1.34.2
@@ -156,7 +158,6 @@ require (
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
-	github.com/spf13/viper v1.19.0 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/supranational/blst v0.3.11 // indirect

server/v2/cometbft/go.sum

@@ -8,8 +8,6 @@ cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s=
 cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0=
 cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
 cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
-cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI=
-cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM=
 cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
 cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
 cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5 h1:eb0kcGyaYHSS0do7+MIWg7UKlskSH01biRNENbm/zDA=

server/v2/cometbft/server.go

@@ -5,6 +5,7 @@ import (
 	"crypto/sha256"
 	"encoding/json"
 	"fmt"
+	"path/filepath"
 
 	abciserver "github.com/cometbft/cometbft/abci/server"
 	cmtcmd "github.com/cometbft/cometbft/cmd/cometbft/commands"
@@ -15,7 +16,9 @@ import (
 	"github.com/cometbft/cometbft/proxy"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
 
+	corectx "cosmossdk.io/core/context"
 	"cosmossdk.io/core/log"
 	"cosmossdk.io/core/transaction"
 	serverv2 "cosmossdk.io/server/v2"
@@ -42,15 +45,14 @@ const (
 	FlagTrace         = "trace"
 )
 
-var _ serverv2.ServerModule = (*CometBFTServer[transaction.Tx])(nil)
+var _ serverv2.ServerComponent[transaction.Tx] = (*CometBFTServer[transaction.Tx])(nil)
 
 type CometBFTServer[T transaction.Tx] struct {
 	Node   *node.Node
 	App    *Consensus[T]
 	logger log.Logger
 
-	config    Config
-	cleanupFn func()
+	config Config
 }
 
 // App is an interface that represents an application in the CometBFT server.
@@ -61,20 +63,25 @@ type App[T transaction.Tx] interface {
 	GetStore() types.Store
 }
 
-func NewCometBFTServer[T transaction.Tx](
-	app *appmanager.AppManager[T],
-	store types.Store,
-	logger log.Logger,
-	cfg Config,
-	txCodec transaction.Codec[T],
-) *CometBFTServer[T] {
+func New[T transaction.Tx](txCodec transaction.Codec[T]) *CometBFTServer[T] {
+	consensus := &Consensus[T]{txCodec: txCodec}
+	return &CometBFTServer[T]{
+		App: consensus,
+	}
+}
+
+func (s *CometBFTServer[T]) Init(appI serverv2.AppI[T], v *viper.Viper, logger log.Logger) (serverv2.ServerComponent[T], error) {
+	store := appI.GetStore().(types.Store)
+
+	cfg := Config{CmtConfig: GetConfigFromViper(v), ConsensusAuthority: appI.GetConsensusAuthority()}
 	logger = logger.With("module", "cometbft-server")
 
 	// create noop mempool
 	mempool := mempool.NoOpMempool[T]{}
 
 	// create consensus
-	consensus := NewConsensus[T](app, mempool, store, cfg, txCodec, logger)
+	// txCodec should be in server from New()
+	consensus := NewConsensus[T](appI.GetAppManager(), mempool, store, cfg, s.App.txCodec, logger)
 
 	consensus.SetPrepareProposalHandler(handlers.NoOpPrepareProposal[T]())
 	consensus.SetProcessProposalHandler(handlers.NoOpProcessProposal[T]())
@@ -93,18 +100,25 @@ func NewCometBFTServer[T transaction.Tx](
 	sm := snapshots.NewManager(snapshotStore, snapshots.SnapshotOptions{}, sc, ss, nil, logger) // TODO: set options somehow
 	consensus.SetSnapshotManager(sm)
 
+	s.config = cfg
+	s.App = consensus
+	s.logger = logger
+
 	return &CometBFTServer[T]{
 		logger: logger,
 		App:    consensus,
 		config: cfg,
-	}
+	}, nil
 }
 
 func (s *CometBFTServer[T]) Name() string {
 	return "cometbft"
 }
 
 func (s *CometBFTServer[T]) Start(ctx context.Context) error {
+	viper := ctx.Value(corectx.ViperContextKey{}).(*viper.Viper)
+	cometConfig := GetConfigFromViper(viper)
+
 	wrappedLogger := cometlog.CometLoggerWrapper{Logger: s.logger}
 	if s.config.Standalone {
 		svr, err := abciserver.NewServer(s.config.Addr, s.config.Transport, s.App)
@@ -117,40 +131,34 @@ func (s *CometBFTServer[T]) Start(ctx context.Context) error {
 		return svr.Start()
 	}
 
-	nodeKey, err := p2p.LoadOrGenNodeKey(s.config.CmtConfig.NodeKeyFile())
+	nodeKey, err := p2p.LoadOrGenNodeKey(cometConfig.NodeKeyFile())
 	if err != nil {
 		return err
 	}
 
 	s.Node, err = node.NewNode(
 		ctx,
-		s.config.CmtConfig,
-		pvm.LoadOrGenFilePV(s.config.CmtConfig.PrivValidatorKeyFile(), s.config.CmtConfig.PrivValidatorStateFile()),
+		cometConfig,
+		pvm.LoadOrGenFilePV(cometConfig.PrivValidatorKeyFile(), cometConfig.PrivValidatorStateFile()),
 		nodeKey,
 		proxy.NewLocalClientCreator(s.App),
-		getGenDocProvider(s.config.CmtConfig),
+		getGenDocProvider(cometConfig),
 		cmtcfg.DefaultDBProvider,
-		node.DefaultMetricsProvider(s.config.CmtConfig.Instrumentation),
+		node.DefaultMetricsProvider(cometConfig.Instrumentation),
 		wrappedLogger,
 	)
 	if err != nil {
 		return err
 	}
 
-	s.cleanupFn = func() {
-		if s.Node != nil && s.Node.IsRunning() {
-			_ = s.Node.Stop()
-		}
-	}
-
 	return s.Node.Start()
 }
 
-func (s *CometBFTServer[T]) Stop(_ context.Context) error {
-	defer s.cleanupFn()
-	if s.Node != nil {
+func (s *CometBFTServer[T]) Stop(context.Context) error {
+	if s.Node != nil && s.Node.IsRunning() {
 		return s.Node.Stop()
 	}
+
 	return nil
 }
 
@@ -223,3 +231,9 @@ func (s *CometBFTServer[T]) CLICommands() serverv2.CLIConfig {
 		},
 	}
 }
+
+func (s *CometBFTServer[T]) WriteDefaultConfigAt(configPath string) error {
+	cometConfig := cmtcfg.DefaultConfig()
+	cmtcfg.WriteConfigFile(filepath.Join(configPath, "config.toml"), cometConfig)
+	return nil
+}