refactor(template/app): simplify cmd package and use cosmosapp module

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/charmbracelet/glow v1.4.0
 	github.com/containerd/containerd v1.5.2 // indirect
-	github.com/cosmos/cosmos-sdk v0.42.4
+	github.com/cosmos/cosmos-sdk v0.42.6
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/dariubs/percent v0.0.0-20200128140941-b7801cf1c7e2
 	github.com/docker/docker v20.10.7+incompatible
@@ -33,7 +33,7 @@ require (
 	github.com/manifoldco/promptui v0.8.0
 	github.com/moby/sys/mount v0.2.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/otiai10/copy v1.4.2
+	github.com/otiai10/copy v1.6.0
 	github.com/pelletier/go-toml v1.8.1
 	github.com/pkg/errors v0.9.1
 	github.com/radovskyb/watcher v1.0.7
@@ -42,16 +42,15 @@ require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	github.com/tendermint/spm v0.0.0-20210524110815-6d7452d2dc4a
+	github.com/tendermint/spm v0.0.0-20210705094313-42e72ad05b63
 	github.com/tendermint/spn v0.0.0-20210406123257-decaff8dcaf9
-	github.com/tendermint/tendermint v0.34.9
+	github.com/tendermint/tendermint v0.34.11
 	github.com/tendermint/vue v0.1.49
 	go.opencensus.io v0.22.6 // indirect
 	golang.org/x/mod v0.4.2
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
 	google.golang.org/genproto v0.0.0-20210426193834-eac7f76ac494 // indirect
-	google.golang.org/grpc v1.37.0 // indirect
 )
 
 replace (

starport/services/scaffolder/module.go

@@ -212,6 +212,11 @@ func (s *Scaffolder) ImportModule(tracer *placeholder.Tracer, name string) (sm x
 
 	sm, err = xgenny.RunWithValidation(tracer, g)
 	if err != nil {
+		var validationErr validation.Error
+		if errors.As(err, &validationErr) {
+			// TODO: implement a more generic method when there will be new methods to import wasm
+			return sm, errors.New("wasm cannot be imported. Apps initialized with Starport <=0.16.2 must downgrade Starport to 0.16.2 to import wasm")
+		}
 		return sm, err
 	}
 

starport/templates/app/stargate/app/app.go.plush

@@ -82,12 +82,16 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	tmjson "github.com/tendermint/tendermint/libs/json"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	appparams "<%= ModulePath %>/app/params"
 	"<%= ModulePath %>/docs"
 	// this line is used by starport scaffolding # stargate/app/moduleImport
+
+    "github.com/tendermint/spm/cosmoscmd"
 )
 
-const Name = "<%= BinaryNamePrefix %>"
+const (
+	AccountAddressPrefix = "<%= AddressPrefix %>"
+	Name                 = "<%= BinaryNamePrefix %>"
+)
 
 // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals
 
@@ -147,7 +151,7 @@ var (
 )
 
 var (
-	_ CosmosApp               = (*App)(nil)
+	_ cosmoscmd.CosmosApp     = (*App)(nil)
 	_ servertypes.Application = (*App)(nil)
 )
 
@@ -204,13 +208,18 @@ type App struct {
 }
 
 // New returns a reference to an initialized Gaia.
-// NewSimApp returns a reference to an initialized SimApp.
 func New(
-	logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool,
-	homePath string, invCheckPeriod uint, encodingConfig appparams.EncodingConfig,
-	// this line is used by starport scaffolding # stargate/app/newArgument
-	appOpts servertypes.AppOptions, baseAppOptions ...func(*baseapp.BaseApp),
-) *App {
+	logger log.Logger,
+	db dbm.DB,
+	traceStore io.Writer,
+	loadLatest bool,
+	skipUpgradeHeights map[int64]bool,
+	homePath string,
+	invCheckPeriod uint,
+	encodingConfig cosmoscmd.EncodingConfig,
+	appOpts servertypes.AppOptions,
+	baseAppOptions ...func(*baseapp.BaseApp),
+) cosmoscmd.App {
 
 	appCodec := encodingConfig.Marshaler
 	cdc := encodingConfig.Amino