feat: Implement RegisterServices for CoreAPI in module manager

types/module/configurator.go

@@ -4,19 +4,26 @@ import (
 	"fmt"
 
 	"github.com/cosmos/gogoproto/grpc"
+	"github.com/cosmos/gogoproto/proto"
+	googlegrpc "google.golang.org/grpc"
+	protobuf "google.golang.org/protobuf/proto"
 
 	errorsmod "cosmossdk.io/errors"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
+	cosmosmsg "cosmossdk.io/api/cosmos/msg/v1"
 )
 
 // Configurator provides the hooks to allow modules to configure and register
 // their services in the RegisterServices method. It is designed to eventually
 // support module object capabilities isolation as described in
 // https://github.com/cosmos/cosmos-sdk/issues/7093
 type Configurator interface {
+	grpc.Server
+
 	// MsgServer returns a grpc.Server instance which allows registering services
 	// that will handle TxBody.messages in transactions. These Msg's WILL NOT
 	// be exposed as gRPC services.
@@ -47,6 +54,26 @@ type configurator struct {
 	migrations map[string]map[uint64]MigrationHandler
 }
 
+// RegisterService implements Configurator
+func (c configurator) RegisterService(sd *googlegrpc.ServiceDesc, ss interface{}) {
+	fds, err := proto.MergedFileDescriptors()
+	if err != nil {
+		panic(err)
+	}
+
+	for _, fd := range fds.File {
+		for _, svc := range fd.GetService() {
+			if sd.ServiceName == fd.GetPackage()+"."+svc.GetName() {
+				if protobuf.HasExtension(svc.Options, cosmosmsg.E_Service) {
+					c.msgServer.RegisterService(sd, ss)
+				} else {
+					c.queryServer.RegisterService(sd, ss)
+				}
+			}
+		}
+	}
+}
+
 // NewConfigurator returns a new Configurator instance
 func NewConfigurator(cdc codec.Codec, msgServer grpc.Server, queryServer grpc.Server) Configurator {
 	return configurator{

types/module/core_module.go

@@ -20,6 +20,7 @@ import (
 var (
 	_ AppModuleBasic = coreAppModuleBasicAdapator{}
 	_ HasGenesis     = coreAppModuleBasicAdapator{}
+	_ HasServices    = coreAppModuleBasicAdapator{}
 )
 
 // CoreAppModuleBasicAdaptor wraps the core API module as an AppModule that this version
@@ -161,3 +162,10 @@ func (c coreAppModuleBasicAdapator) RegisterLegacyAminoCodec(amino *codec.Legacy
 		mod.RegisterLegacyAminoCodec(amino)
 	}
 }
+
+// RegisterServices implements HasServices
+func (c coreAppModuleBasicAdapator) RegisterServices(cfg Configurator) {
+	if module, ok := c.module.(appmodule.HasServices); ok {
+		module.RegisterServices(cfg)
+	}
+}

types/module/module.go

@@ -372,6 +372,8 @@ func (m *Manager) RegisterServices(cfg Configurator) {
 	for _, module := range m.Modules {
 		if module, ok := module.(HasServices); ok {
 			module.RegisterServices(cfg)
+		} else if module, ok := module.(appmodule.HasServices); ok {
+			module.RegisterServices(cfg)
 		}
 	}
 }

types/module/module_test.go

@@ -14,12 +14,14 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/testutil/mock"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
 var errFoo = errors.New("dummy")
@@ -155,7 +157,7 @@ func TestManager_RegisterQueryServices(t *testing.T) {
 
 	mockAppModule1 := mock.NewMockAppModuleWithAllExtensions(mockCtrl)
 	mockAppModule2 := mock.NewMockAppModuleWithAllExtensions(mockCtrl)
-	mockAppModule3 := mock.NewMockCoreAppModule(mockCtrl)
+	mockAppModule3 := MockCoreAppModule{}
 	mockAppModule1.EXPECT().Name().Times(2).Return("module1")
 	mockAppModule2.EXPECT().Name().Times(2).Return("module2")
 	// TODO: This is not working for Core API modules yet
@@ -164,14 +166,17 @@ func TestManager_RegisterQueryServices(t *testing.T) {
 	require.Equal(t, 3, len(mm.Modules))
 
 	msgRouter := mock.NewMockServer(mockCtrl)
+	msgRouter.EXPECT().RegisterService(gomock.Any(), gomock.Any()).Times(1)
 	queryRouter := mock.NewMockServer(mockCtrl)
+	queryRouter.EXPECT().RegisterService(gomock.Any(), gomock.Any()).Times(1)
+
 	interfaceRegistry := types.NewInterfaceRegistry()
 	cdc := codec.NewProtoCodec(interfaceRegistry)
 	cfg := module.NewConfigurator(cdc, msgRouter, queryRouter)
 	mockAppModule1.EXPECT().RegisterServices(cfg).Times(1)
 	mockAppModule2.EXPECT().RegisterServices(cfg).Times(1)
 
-	mm.RegisterServices(cfg)
+	require.NotPanics(t, func() { mm.RegisterServices(cfg) })
 }
 
 func TestManager_InitGenesis(t *testing.T) {
@@ -484,6 +489,13 @@ func TestCoreAPIManager_EndBlock(t *testing.T) {
 // MockCoreAppModule allows us to test functions like DefaultGenesis
 type MockCoreAppModule struct{}
 
+// RegisterServices implements appmodule.HasServices
+func (MockCoreAppModule) RegisterServices(reg grpc.ServiceRegistrar) {
+	// Use Auth's service definitions as a placeholder
+	authtypes.RegisterQueryServer(reg, &authtypes.UnimplementedQueryServer{})
+	authtypes.RegisterMsgServer(reg, &authtypes.UnimplementedMsgServer{})
+}
+
 func (MockCoreAppModule) IsOnePerModuleType() {}
 func (MockCoreAppModule) IsAppModule()        {}
 func (MockCoreAppModule) DefaultGenesis(target appmodule.GenesisTarget) error {
@@ -523,6 +535,7 @@ func (MockCoreAppModule) ExportGenesis(ctx context.Context, target appmodule.Gen
 }
 
 var (
-	_ appmodule.AppModule  = MockCoreAppModule{}
-	_ appmodule.HasGenesis = MockCoreAppModule{}
+	_ appmodule.AppModule   = MockCoreAppModule{}
+	_ appmodule.HasGenesis  = MockCoreAppModule{}
+	_ appmodule.HasServices = MockCoreAppModule{}
 )