tests(integration): port x/bank tests to server/v2 app

codec/depinject.go

@@ -16,6 +16,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/types"
 )
 
+var DefaultProviders = depinject.Provide(
+	ProvideInterfaceRegistry,
+	ProvideLegacyAmino,
+	ProvideProtoCodec,
+	ProvideAddressCodec,
+)
+
 func ProvideInterfaceRegistry(
 	addressCodec address.Codec,
 	validatorAddressCodec address.ValidatorAddressCodec,

go.mod

@@ -184,6 +184,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.34.2-20240130113600-88e
 buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2/go.mod h1:HqcXMSa5qnNuakaMUo+hWhF51mKbcrZxGl9Vp5EeJXc=
 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.3 h1:pnxaYAas7llXgVz1lM7X6De74nWrhNKnB3yMKe4OUUA=
-cosmossdk.io/core v1.0.0-alpha.3/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

@@ -6,28 +6,22 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"path/filepath"
 
 	"cosmossdk.io/core/appmodule"
 	appmodulev2 "cosmossdk.io/core/appmodule/v2"
-	"cosmossdk.io/core/server"
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/runtime/v2/services"
 	"cosmossdk.io/server/v2/appmanager"
 	"cosmossdk.io/server/v2/stf"
 	"cosmossdk.io/server/v2/stf/branch"
-	"cosmossdk.io/store/v2/db"
-	rootstore "cosmossdk.io/store/v2/root"
 )
 
 // AppBuilder is a type that is injected into a container by the runtime/v2 module
 // (as *AppBuilder) which can be used to create an app which is compatible with
 // the existing app.go initialization conventions.
 type AppBuilder[T transaction.Tx] struct {
-	app          *App[T]
-	config       server.DynamicConfig
-	storeOptions *rootstore.Options
+	app *App[T]
 
 	// the following fields are used to overwrite the default
 	branch      func(state store.ReaderMap) store.WriterMap
@@ -99,6 +93,10 @@ func (a *AppBuilder[T]) Build(opts ...AppBuilderOption[T]) (*App[T], error) {
 		}
 	}
 
+	if a.app.db == nil {
+		return nil, fmt.Errorf("app.db is not set, it is required to build the app")
+	}
+
 	if err := a.app.moduleManager.RegisterServices(a.app); err != nil {
 		return nil, err
 	}
@@ -122,37 +120,6 @@ func (a *AppBuilder[T]) Build(opts ...AppBuilderOption[T]) (*App[T], error) {
 	}
 	a.app.stf = stf
 
-	home := a.config.GetString(FlagHome)
-	scRawDb, err := db.NewDB(
-		db.DBType(a.config.GetString("store.app-db-backend")),
-		"application",
-		filepath.Join(home, "data"),
-		nil,
-	)
-	if err != nil {
-		panic(err)
-	}
-
-	var storeOptions rootstore.Options
-	if a.storeOptions != nil {
-		storeOptions = *a.storeOptions
-	} else {
-		storeOptions = rootstore.DefaultStoreOptions()
-	}
-	factoryOptions := &rootstore.FactoryOptions{
-		Logger:    a.app.logger,
-		RootDir:   home,
-		Options:   storeOptions,
-		StoreKeys: append(a.app.storeKeys, "stf"),
-		SCRawDB:   scRawDb,
-	}
-
-	rs, err := rootstore.CreateRootStore(factoryOptions)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create root store: %w", err)
-	}
-	a.app.db = rs
-
 	appManagerBuilder := appmanager.Builder[T]{
 		STF:                a.app.stf,
 		DB:                 a.app.db,
@@ -251,9 +218,3 @@ func AppBuilderWithPostTxExec[T transaction.Tx](postTxExec func(ctx context.Cont
 		a.postTxExec = postTxExec
 	}
 }
-
-func AppBuilderWithStoreOptions[T transaction.Tx](opts *rootstore.Options) AppBuilderOption[T] {
-	return func(a *AppBuilder[T]) {
-		a.storeOptions = opts
-	}
-}

runtime/v2/module.go

@@ -16,6 +16,7 @@ import (
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
 	appmodulev2 "cosmossdk.io/core/appmodule/v2"
 	"cosmossdk.io/core/comet"
+	"cosmossdk.io/core/event"
 	"cosmossdk.io/core/header"
 	"cosmossdk.io/core/registry"
 	"cosmossdk.io/core/server"
@@ -26,6 +27,7 @@ import (
 	"cosmossdk.io/log"
 	"cosmossdk.io/runtime/v2/services"
 	"cosmossdk.io/server/v2/stf"
+	rootstore "cosmossdk.io/store/v2/root"
 )
 
 var (
@@ -40,19 +42,19 @@ type appModule[T transaction.Tx] struct {
 func (m appModule[T]) IsOnePerModuleType() {}
 func (m appModule[T]) IsAppModule()        {}
 
-func (m appModule[T]) RegisterServices(registar grpc.ServiceRegistrar) error {
+func (m appModule[T]) RegisterServices(registrar grpc.ServiceRegistrar) error {
 	autoCliQueryService, err := services.NewAutoCLIQueryService(m.app.moduleManager.modules)
 	if err != nil {
 		return err
 	}
 
-	autocliv1.RegisterQueryServer(registar, autoCliQueryService)
+	autocliv1.RegisterQueryServer(registrar, autoCliQueryService)
 
 	reflectionSvc, err := services.NewReflectionService()
 	if err != nil {
 		return err
 	}
-	reflectionv1.RegisterReflectionServiceServer(registar, reflectionSvc)
+	reflectionv1.RegisterReflectionServiceServer(registrar, reflectionSvc)
 
 	return nil
 }
@@ -97,6 +99,7 @@ func init() {
 			ProvideAppBuilder[transaction.Tx],
 			ProvideEnvironment[transaction.Tx],
 			ProvideModuleManager[transaction.Tx],
+			ProvideStoreBuilder,
 		),
 		appconfig.Invoke(SetupAppBuilder),
 	)
@@ -146,7 +149,9 @@ type AppInputs struct {
 	InterfaceRegistrar registry.InterfaceRegistrar
 	LegacyAmino        registry.AminoRegistrar
 	Logger             log.Logger
+	StoreBuilder       *StoreBuilder
 	DynamicConfig      server.DynamicConfig `optional:"true"` // can be nil in client wiring
+	StoreOptions       *rootstore.Options   `optional:"true"` // if unset defaults will be used
 }
 
 func SetupAppBuilder(inputs AppInputs) {
@@ -157,8 +162,22 @@ func SetupAppBuilder(inputs AppInputs) {
 	app.moduleManager.RegisterInterfaces(inputs.InterfaceRegistrar)
 	app.moduleManager.RegisterLegacyAminoCodec(inputs.LegacyAmino)
 
-	if inputs.DynamicConfig != nil {
-		inputs.AppBuilder.config = inputs.DynamicConfig
+	if inputs.DynamicConfig == nil {
+		return
+	}
+	storeOptions := rootstore.DefaultStoreOptions()
+	if inputs.StoreOptions != nil {
+		storeOptions = *inputs.StoreOptions
+	}
+	var err error
+	app.db, err = inputs.StoreBuilder.Build(
+		inputs.Logger,
+		app.storeKeys,
+		inputs.DynamicConfig,
+		storeOptions,
+	)
+	if err != nil {
+		panic(err)
 	}
 }
 
@@ -178,6 +197,7 @@ func ProvideEnvironment[T transaction.Tx](
 	appBuilder *AppBuilder[T],
 	kvFactory store.KVStoreServiceFactory,
 	headerService header.Service,
+	eventService event.Service,
 ) (
 	appmodulev2.Environment,
 	store.KVStoreService,
@@ -209,7 +229,7 @@ func ProvideEnvironment[T transaction.Tx](
 	env := appmodulev2.Environment{
 		Logger:             logger,
 		BranchService:      stf.BranchService{},
-		EventService:       stf.NewEventService(),
+		EventService:       eventService,
 		GasService:         stf.NewGasMeterService(),
 		HeaderService:      headerService,
 		QueryRouterService: stf.NewQueryRouterService(),
@@ -254,10 +274,12 @@ func DefaultServiceBindings() depinject.Config {
 		}
 		headerService header.Service = services.NewGenesisHeaderService(stf.HeaderService{})
 		cometService  comet.Service  = &services.ContextAwareCometInfoService{}
+		eventService                 = stf.NewEventService()
 	)
 	return depinject.Supply(
 		kvServiceFactory,
 		headerService,
 		cometService,
+		eventService,
 	)
 }

runtime/v2/store.go

@@ -3,11 +3,16 @@ package runtime
 import (
 	"errors"
 	"fmt"
+	"path/filepath"
 
+	"cosmossdk.io/core/server"
 	"cosmossdk.io/core/store"
+	"cosmossdk.io/log"
 	"cosmossdk.io/server/v2/stf"
 	storev2 "cosmossdk.io/store/v2"
+	"cosmossdk.io/store/v2/db"
 	"cosmossdk.io/store/v2/proof"
+	"cosmossdk.io/store/v2/root"
 )
 
 // NewKVStoreService creates a new KVStoreService.
@@ -59,6 +64,56 @@ type Store interface {
 	LastCommitID() (proof.CommitID, error)
 }
 
+// StoreBuilder is a builder for a store/v2 RootStore satisfying the Store interface.
+type StoreBuilder struct {
+	store Store
+}
+
+// Build creates a new store/v2 RootStore.
+func (sb *StoreBuilder) Build(
+	logger log.Logger,
+	storeKeys []string,
+	config server.DynamicConfig,
+	options root.Options,
+) (Store, error) {
+	if sb.store != nil {
+		return sb.store, nil
+	}
+	home := config.GetString(FlagHome)
+	scRawDb, err := db.NewDB(
+		db.DBType(config.GetString("store.app-db-backend")),
+		"application",
+		filepath.Join(home, "data"),
+		nil,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create SCRawDB: %w", err)
+	}
+
+	factoryOptions := &root.FactoryOptions{
+		Logger:    logger,
+		RootDir:   home,
+		Options:   options,
+		StoreKeys: append(storeKeys, "stf"),
+		SCRawDB:   scRawDb,
+	}
+
+	rs, err := root.CreateRootStore(factoryOptions)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create root store: %w", err)
+	}
+	sb.store = rs
+	return sb.store, nil
+}
+
+func (sb *StoreBuilder) Get() Store {
+	return sb.store
+}
+
+func ProvideStoreBuilder() *StoreBuilder {
+	return &StoreBuilder{}
+}
+
 // StoreLoader allows for custom loading of the store, this is useful when upgrading the store from a previous version
 type StoreLoader func(store Store) error
 

server/v2/stf/core_header_service.go

@@ -24,8 +24,6 @@ const headerInfoPrefix = 0x37
 
 // setHeaderInfo sets the header info in the state to be used by queries in the future.
 func (s STF[T]) setHeaderInfo(state store.WriterMap, headerInfo header.Info) error {
-	// TODO storing header info is too low level here, stf should be stateless.
-	// We should have a keeper that does this.
 	runtimeStore, err := state.GetWriter(Identity)
 	if err != nil {
 		return err

simapp/go.mod

@@ -243,6 +243,7 @@ replace (
 	cosmossdk.io/api => ../api
 	cosmossdk.io/client/v2 => ../client/v2
 	cosmossdk.io/collections => ../collections
+	cosmossdk.io/core => ../core
 	cosmossdk.io/store => ../store
 	cosmossdk.io/tools/confix => ../tools/confix
 	cosmossdk.io/x/accounts => ../x/accounts

simapp/go.sum

@@ -192,8 +192,6 @@ cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xX
 cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg=
 cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
 cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
-cosmossdk.io/core v1.0.0-alpha.3 h1:pnxaYAas7llXgVz1lM7X6De74nWrhNKnB3yMKe4OUUA=
-cosmossdk.io/core v1.0.0-alpha.3/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=

simapp/v2/app_di.go

@@ -61,10 +61,9 @@ func NewSimApp[T transaction.Tx](
 	viper *viper.Viper,
 ) *SimApp[T] {
 	var (
-		app          = &SimApp[T]{}
-		appBuilder   *runtime.AppBuilder[T]
-		err          error
-		storeOptions = &root.Options{}
+		app        = &SimApp[T]{}
+		appBuilder *runtime.AppBuilder[T]
+		err        error
 
 		// merge the AppConfig and other configuration in one config
 		appConfig = depinject.Configs(
@@ -127,6 +126,15 @@ func NewSimApp[T transaction.Tx](
 		)
 	)
 
+	if sub := viper.Sub("store.options"); sub != nil {
+		storeOptions := &root.Options{}
+		err := sub.Unmarshal(storeOptions)
+		if err != nil {
+			panic(err)
+		}
+		appConfig = depinject.Configs(appConfig, depinject.Supply(storeOptions))
+	}
+
 	if err := depinject.Inject(appConfig,
 		&appBuilder,
 		&app.appCodec,
@@ -138,15 +146,7 @@ func NewSimApp[T transaction.Tx](
 		panic(err)
 	}
 
-	var builderOpts []runtime.AppBuilderOption[T]
-	if sub := viper.Sub("store.options"); sub != nil {
-		err = sub.Unmarshal(storeOptions)
-		if err != nil {
-			panic(err)
-		}
-		builderOpts = append(builderOpts, runtime.AppBuilderWithStoreOptions[T](storeOptions))
-	}
-	app.App, err = appBuilder.Build(builderOpts...)
+	app.App, err = appBuilder.Build()
 	if err != nil {
 		panic(err)
 	}

store/v2/db/db.go

@@ -22,7 +22,6 @@ func NewDB(dbType DBType, name, dataDir string, opts store.DBOptions) (corestore
 	switch dbType {
 	case DBTypeGoLevelDB:
 		return NewGoLevelDB(name, dataDir, opts)
-
 	case DBTypePebbleDB:
 		return NewPebbleDB(name, dataDir)
 	}