chore(server/v2): create v2 subpackage in core

core/appmodule/environment.go

@@ -1,21 +1,8 @@
 package appmodule
 
 import (
-	"cosmossdk.io/core/branch"
-	"cosmossdk.io/core/event"
-	"cosmossdk.io/core/gas"
-	"cosmossdk.io/core/header"
-	"cosmossdk.io/core/store"
-	"cosmossdk.io/log"
+	"cosmossdk.io/core/appmodule/v2"
 )
 
 // Environment is used to get all services to their respective module
-type Environment struct {
-	BranchService   branch.Service
-	EventService    event.Service
-	GasService      gas.Service
-	HeaderService   header.Service
-	KVStoreService  store.KVStoreService
-	MemStoreService store.MemoryStoreService
-	Logger          log.Logger
-}
+type Environment = appmodule.Environment

core/appmodule/migrations.go

@@ -1,22 +1,13 @@
 package appmodule
 
-import "context"
+import (
+	"cosmossdk.io/core/appmodule/v2"
+)
 
-type MigrationRegistrar interface {
-	// Register registers an in-place store migration for a module. The
-	// handler is a migration script to perform in-place migrations from version
-	// `fromVersion` to version `fromVersion+1`.
-	//
-	// EACH TIME a module's ConsensusVersion increments, a new migration MUST
-	// be registered using this function. If a migration handler is missing for
-	// a particular function, the upgrade logic (see RunMigrations function)
-	// will panic. If the ConsensusVersion bump does not introduce any store
-	// changes, then a no-op function must be registered here.
-	Register(moduleName string, fromVersion uint64, handler MigrationHandler) error
-}
+type MigrationRegistrar = appmodule.MigrationRegistrar
 
 // MigrationHandler is the migration function that each module registers.
-type MigrationHandler func(context.Context) error
+type MigrationHandler = appmodule.MigrationHandler
 
 // VersionMap is a map of moduleName -> version
-type VersionMap map[string]uint64
+type VersionMap = appmodule.VersionMap

core/appmodule/module.go

@@ -5,57 +5,40 @@ import (
 
 	"google.golang.org/grpc"
 
-	"cosmossdk.io/core/transaction"
+	"cosmossdk.io/core/appmodule/v2"
 )
 
 // AppModule is a tag interface for app module implementations to use as a basis
 // for extension interfaces. It provides no functionality itself, but is the
 // type that all valid app modules should provide so that they can be identified
 // by other modules (usually via depinject) as app modules.
-type AppModule interface {
-	// IsAppModule is a dummy method to tag a struct as implementing an AppModule.
-	IsAppModule()
+type AppModule = appmodule.AppModule
 
-	// IsOnePerModuleType is a dummy method to help depinject resolve modules.
-	IsOnePerModuleType()
-}
+// HasMigrations is the extension interface that modules should implement to register migrations.
+type HasMigrations = appmodule.HasMigrations
 
-// HasServices is the extension interface that modules should implement to register
-// implementations of services defined in .proto files.
-type HasServices interface {
-	AppModule
+// HasConsensusVersion is the interface for declaring a module consensus version.
+type HasConsensusVersion = appmodule.HasConsensusVersion
 
-	// RegisterServices registers the module's services with the app's service
-	// registrar.
-	//
-	// Two types of services are currently supported:
-	// - read-only gRPC query services, which are the default.
-	// - transaction message services, which must have the protobuf service
-	//   option "cosmos.msg.v1.service" (defined in "cosmos/msg/v1/service.proto")
-	//   set to true.
-	//
-	// The service registrar will figure out which type of service you are
-	// implementing based on the presence (or absence) of protobuf options. You
-	// do not need to specify this in golang code.
-	RegisterServices(grpc.ServiceRegistrar) error
-}
+// HasBeginBlocker is the extension interface that modules should implement to run
+// custom logic before transaction processing in a block.
+type HasBeginBlocker = appmodule.HasBeginBlocker
 
-// HasMigrations is the extension interface that modules should implement to register migrations.
-type HasMigrations interface {
-	AppModule
-	HasConsensusVersion
+// HasEndBlocker is the extension interface that modules should implement to run
+// custom logic after transaction processing in a block.
+type HasEndBlocker = appmodule.HasEndBlocker
 
-	// RegisterMigrations registers the module's migrations with the app's migrator.
-	RegisterMigrations(MigrationRegistrar) error
+// HasPrepareCheckState is an extension interface that contains information about the AppModule
+// and PrepareCheckState.
+type HasPrepareCheckState interface {
+	AppModule
+	PrepareCheckState(context.Context) error
 }
 
-// HasConsensusVersion is the interface for declaring a module consensus version.
-type HasConsensusVersion interface {
-	// ConsensusVersion is a sequence number for state-breaking change of the
-	// module. It should be incremented on each consensus-breaking change
-	// introduced by the module. To avoid wrong/empty versions, the initial version
-	// should be set to 1.
-	ConsensusVersion() uint64
+// HasPrecommit is an extension interface that contains information about the AppModule and Precommit.
+type HasPrecommit interface {
+	AppModule
+	Precommit(context.Context) error
 }
 
 // ResponsePreBlock represents the response from the PreBlock method.
@@ -74,92 +57,22 @@ type HasPreBlocker interface {
 	PreBlock(context.Context) (ResponsePreBlock, error)
 }
 
-// HasBeginBlocker is the extension interface that modules should implement to run
-// custom logic before transaction processing in a block.
-type HasBeginBlocker interface {
-	AppModule
-
-	// BeginBlock is a method that will be run before transactions are processed in
-	// a block.
-	BeginBlock(context.Context) error
-}
-
-// HasEndBlocker is the extension interface that modules should implement to run
-// custom logic after transaction processing in a block.
-type HasEndBlocker interface {
-	AppModule
-
-	// EndBlock is a method that will be run after transactions are processed in
-	// a block.
-	EndBlock(context.Context) error
-}
-
-// HasTxValidation is the extension interface that modules should implement to run
-// custom logic for validating transactions.
-// It was previously known as AnteHandler/Decorator.
-type HasTxValidation[T transaction.Tx] interface {
-	AppModule
-
-	// TxValidator is a method that will be run on each transaction.
-	// If an error is returned:
-	// 	                          ,---.
-	//                           /    |
-	//                          /     |
-	//  You shall not pass!    /      |
-	//                        /       |
-	//           \       ___,'        |
-	//                 <  -'          :
-	//                  `-.__..--'``-,_\_
-	//                     |o/ <o>` :,.)_`>
-	//                     :/ `     ||/)
-	//                     (_.).__,-` |\
-	//                     /( `.``   `| :
-	//                     \'`-.)  `  ; ;
-	//                     | `       /-<
-	//                     |     `  /   `.
-	//     ,-_-..____     /|  `    :__..-'\
-	//    /,'-.__\\  ``-./ :`      ;       \
-	//    `\ `\  `\\  \ :  (   `  /  ,   `. \
-	//      \` \   \\   |  | `   :  :     .\ \
-	//       \ `\_  ))  :  ;     |  |      ): :
-	//      (`-.-'\ ||  |\ \   ` ;  ;       | |
-	//       \-_   `;;._   ( `  /  /_       | |
-	//        `-.-.// ,'`-._\__/_,'         ; |
-	//           \:: :     /     `     ,   /  |
-	//            || |    (        ,' /   /   |
-	//            ||                ,'   /    |
-	TxValidator(ctx context.Context, tx T) error
-}
-
-// HasUpdateValidators is an extension interface that contains information about the AppModule and UpdateValidators.
-// It can be seen as the alternative of the Cosmos SDK' HasABCIEndBlocker.
-// Both are still supported.
-type HasUpdateValidators interface {
-	AppModule
-
-	UpdateValidators(ctx context.Context) ([]ValidatorUpdate, error)
-}
-
-// ValidatorUpdate defines a validator update.
-type ValidatorUpdate struct {
-	PubKey     []byte
-	PubKeyType string
-	Power      int64 // updated power of the validtor
-}
-
-// **********************************************
-// The following interfaces are baseapp specific and will be deprecated in the future.
-// **********************************************
-
-// HasPrepareCheckState is an extension interface that contains information about the AppModule
-// and PrepareCheckState.
-type HasPrepareCheckState interface {
+// HasServices is the extension interface that modules should implement to register
+// implementations of services defined in .proto files.
+type HasServices interface {
 	AppModule
-	PrepareCheckState(context.Context) error
-}
 
-// HasPrecommit is an extension interface that contains information about the AppModule and Precommit.
-type HasPrecommit interface {
-	AppModule
-	Precommit(context.Context) error
+	// RegisterServices registers the module's services with the app's service
+	// registrar.
+	//
+	// Two types of services are currently supported:
+	// - read-only gRPC query services, which are the default.
+	// - transaction message services, which must have the protobuf service
+	//   option "cosmos.msg.v1.service" (defined in "cosmos/msg/v1/service.proto")
+	//   set to true.
+	//
+	// The service registrar will figure out which type of service you are
+	// implementing based on the presence (or absence) of protobuf options. You
+	// do not need to specify this in golang code.
+	RegisterServices(grpc.ServiceRegistrar) error
 }

core/appmodule/v2/environment.go

@@ -0,0 +1,21 @@
+package appmodule
+
+import (
+	"cosmossdk.io/core/branch"
+	"cosmossdk.io/core/event"
+	"cosmossdk.io/core/gas"
+	"cosmossdk.io/core/header"
+	"cosmossdk.io/core/store"
+	"cosmossdk.io/log"
+)
+
+// Environment is used to get all services to their respective module
+type Environment struct {
+	BranchService   branch.Service
+	EventService    event.Service
+	GasService      gas.Service
+	HeaderService   header.Service
+	KVStoreService  store.KVStoreService
+	MemStoreService store.MemoryStoreService
+	Logger          log.Logger
+}

core/appmodule/v2/genesis.go

@@ -0,0 +1,15 @@
+package appmodule
+
+import (
+	"context"
+)
+
+// HasGenesis defines a custom genesis handling API implementation.
+// TODO: finalize this API
+type HasGenesis interface {
+	AppModule
+	DefaultGenesis() Message
+	ValidateGenesis(data Message) error
+	InitGenesis(ctx context.Context, data Message) error
+	ExportGenesis(ctx context.Context) (Message, error)
+}