ignite · lumtis · Feb 5, 2021 · Feb 3, 2021 · Feb 3, 2021 · Feb 3, 2021
diff --git a/integration/cmd_type_test.go b/integration/cmd_type_test.go
@@ -125,6 +125,13 @@ func TestGenerateAnAppWithStargateWithTypeAndVerify(t *testing.T) {
 		ExecShouldError(),
 	))
 
+	env.Must(env.Exec("create a type with legacy scaffold",
+		step.NewSteps(step.New(
+			step.Exec("starport", "type", "participant", "email", "--legacy"),
+			step.Workdir(path),
+		)),
+	))
+
 	env.Must(env.Exec("should prevent creating an existing type",
 		step.NewSteps(step.New(
 			step.Exec("starport", "type", "user", "email"),
@@ -222,6 +229,13 @@ func TestCreateTypeInCustomModuleWithStargate(t *testing.T) {
 		)),
 	))
 
+	env.Must(env.Exec("create a type with legacy scaffold",
+		step.NewSteps(step.New(
+			step.Exec("starport", "type", "participant", "email", "--legacy", "--module", "example"),
+			step.Workdir(path),
+		)),
+	))
+
 	env.Must(env.Exec("create a type in the app's module",
 		step.NewSteps(step.New(
 			step.Exec("starport", "type", "user", "email"),

diff --git a/starport/interface/cli/starport/cmd/type.go b/starport/interface/cli/starport/cmd/type.go
@@ -9,6 +9,7 @@ import (
 
 const (
 	moduleFlag string = "module"
+	legacyFlag string = "legacy"
 )
 
 // NewType command creates a new type command to scaffold types.
@@ -23,16 +24,24 @@ func NewType() *cobra.Command {
 	addSdkVersionFlag(c)
 
 	c.Flags().String(moduleFlag, "", "Module to add the type into. Default: app's main module")
+	c.Flags().Bool(legacyFlag, false, "Scaffold the type without generating MsgServer service")
 
 	return c
 }
 
 func typeHandler(cmd *cobra.Command, args []string) error {
 	// Get the module to add the type into
-	module, _ := cmd.Flags().GetString(moduleFlag)
+	module, err := cmd.Flags().GetString(moduleFlag)
+	if err != nil {
+		return err
+	}
+	legacy, err := cmd.Flags().GetBool(legacyFlag)
+	if err != nil {
+		return err
+	}
 
 	sc := scaffolder.New(appPath)
-	if err := sc.AddType(module, args[0], args[1:]...); err != nil {
+	if err := sc.AddType(legacy, module, args[0], args[1:]...); err != nil {
 		return err
 	}
 	fmt.Printf("\n🎉 Created a type `%[1]v`.\n\n", args[0])

diff --git a/starport/services/scaffolder/type.go b/starport/services/scaffolder/type.go
@@ -23,7 +23,7 @@ const (
 )
 
 // AddType adds a new type stype to scaffolded app by using optional type fields.
-func (s *Scaffolder) AddType(moduleName string, stype string, fields ...string) error {
+func (s *Scaffolder) AddType(legacy bool, moduleName string, stype string, fields ...string) error {
 	version, err := s.version()
 	if err != nil {
 		return err
@@ -109,11 +109,22 @@ func (s *Scaffolder) AddType(moduleName string, stype string, fields ...string)
 			OwnerName:  owner(path.RawPath),
 			TypeName:   stype,
 			Fields:     tfields,
+			Legacy:     legacy,
 		}
 	)
+	// generate depending on the version
 	if majorVersion == cosmosver.Launchpad {
 		g, err = typed.NewLaunchpad(opts)
 	} else {
+		// check if the msgServer convention is used
+		var msgServerDefined bool
+		msgServerDefined, err = isMsgServerDefined(s.path, moduleName)
+		if err != nil {
+			return err
+		}
+		if !msgServerDefined {
+			opts.Legacy = true
+		}
 		g, err = typed.NewStargate(opts)
 	}
 	if err != nil {
@@ -166,8 +177,21 @@ func isTypeCreated(appPath, moduleName, typeName string) (isCreated bool, err er
 	return
 }
 
-func isGoReservedWord(name string) bool {
+// isMsgServerDefined checks if the module uses the MsgServer convention for transactions
+// this is checked by verifying the existence of the tx.proto file
+func isMsgServerDefined(appPath, moduleName string) (bool, error) {
+	txProto, err := filepath.Abs(filepath.Join(appPath, "proto", moduleName, "tx.proto"))
+	if err != nil {
+		return false, err
+	}
 
+	if _, err := os.Stat(txProto); os.IsNotExist(err) {
+		return false, nil
+	}
+	return true, err
+}
+
+func isGoReservedWord(name string) bool {
 	// Check keyword or literal
 	if token.Lookup(name).IsKeyword() {
 		return true

diff --git a/starport/templates/app/stargate/proto/{{appName}}/tx.proto.plush b/starport/templates/app/stargate/proto/{{appName}}/tx.proto.plush
@@ -0,0 +1,13 @@
+syntax = "proto3";
+package <%= nodash(OwnerName) %>.<%= AppName %>.<%= AppName %>;
+
+// this line is used by starport scaffolding # proto/tx/import
+
+option go_package = "<%= ModulePath %>/x/<%= AppName %>/types";
+
+// Msg defines the Msg service.
+service Msg {
+    // this line is used by starport scaffolding # proto/tx/rpc
+}
+
+// this line is used by starport scaffolding # proto/tx/message
diff --git a/starport/templates/app/stargate/x/{{appName}}/handler.go.plush b/starport/templates/app/stargate/x/{{appName}}/handler.go.plush
@@ -11,6 +11,8 @@ import (
 
 // NewHandler ...
 func NewHandler(k keeper.Keeper) sdk.Handler {
+    // this line is used by starport scaffolding # handler/msgServer
+
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
 		ctx = ctx.WithEventManager(sdk.NewEventManager())
 

diff --git a/starport/templates/app/stargate/x/{{appName}}/keeper/msg_server.go.plush b/starport/templates/app/stargate/x/{{appName}}/keeper/msg_server.go.plush
@@ -0,0 +1,17 @@
+package keeper
+
+import (
+    "<%= ModulePath %>/x/<%= AppName %>/types"
+)
+
+type msgServer struct {
+	Keeper
+}
+
+// NewMsgServerImpl returns an implementation of the MsgServer interface
+// for the provided Keeper.
+func NewMsgServerImpl(keeper Keeper) types.MsgServer {
+	return &msgServer{Keeper: keeper}
+}
+
+var _ types.MsgServer = msgServer{}
diff --git a/starport/templates/module/create/stargate/proto/{{moduleName}}/tx.proto.plush b/starport/templates/module/create/stargate/proto/{{moduleName}}/tx.proto.plush
@@ -0,0 +1,13 @@
+syntax = "proto3";
+package <%= nodash(ownerName) %>.<%= appName %>.<%= moduleName %>;
+
+// this line is used by starport scaffolding # proto/tx/import
+
+option go_package = "<%= modulePath %>/x/<%= moduleName %>/types";
+
+// Msg defines the Msg service.
+service Msg {
+    // this line is used by starport scaffolding # proto/tx/rpc
+}
+
+// this line is used by starport scaffolding # proto/tx/message
diff --git a/starport/templates/module/create/stargate/x/{{moduleName}}/handler.go.plush b/starport/templates/module/create/stargate/x/{{moduleName}}/handler.go.plush
@@ -11,6 +11,8 @@ import (
 
 // NewHandler ...
 func NewHandler(k keeper.Keeper) sdk.Handler {
+	// this line is used by starport scaffolding # handler/msgServer
+
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
 		ctx = ctx.WithEventManager(sdk.NewEventManager())
 

diff --git a/starport/templates/module/create/stargate/x/{{moduleName}}/keeper/msg_server.go.plush b/starport/templates/module/create/stargate/x/{{moduleName}}/keeper/msg_server.go.plush
@@ -0,0 +1,17 @@
+package keeper
+
+import (
+	"<%= modulePath %>/x/<%= moduleName %>/types"
+)
+
+type msgServer struct {
+	Keeper
+}
+
+// NewMsgServerImpl returns an implementation of the MsgServer interface
+// for the provided Keeper.
+func NewMsgServerImpl(keeper Keeper) types.MsgServer {
+	return &msgServer{Keeper: keeper}
+}
+
+var _ types.MsgServer = msgServer{}
diff --git a/starport/templates/typed/new_launchpad.go b/starport/templates/typed/new_launchpad.go
@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/gobuffalo/genny"
-	"github.com/tendermint/starport/starport/pkg/cosmosver"
 )
 
 type typedLaunchpad struct {
@@ -25,7 +24,7 @@ func NewLaunchpad(opts *Options) (*genny.Generator, error) {
 	g.RunFn(t.keeperQuerierModify(opts))
 	g.RunFn(t.clientRestRestModify(opts))
 	g.RunFn(t.frontendSrcStoreAppModify(opts))
-	return g, box(cosmosver.Launchpad, opts, g)
+	return g, box(launchpadTemplate, opts, g)
 }
 
 func (t *typedLaunchpad) handlerModify(opts *Options) genny.RunFn {