feat: change app.go to v2 and add AppWiring feature (#3553)

* build buf pkg * fix go.mod * comment xbug pkg and bump buf versions * generate proto from buf and remove protoc and plugins * add proto ts and api generation * add changelog * fix proto and template path * fix wrong template for ts generation * fix api out path * fix ts out path and remove unused log * fix go.mod ident and sort * remove unused method * fix lint * fix wrong lint comment * remove unused tools * fix doctor for tools pkg * add missing tool dependency * add missing import * add global protoanalysis.NewCache to buf structure * fix proto module name * update go.mod * Update ignite/pkg/cosmosgen/generate_go.go method name Co-authored-by: Jerónimo Albi <[email protected]> * Update ignite/pkg/buf/buf.go remove unused ctx Co-authored-by: Jerónimo Albi <[email protected]> * fix wrong method call * fix deep tools * fix ignite doctor * fix buf.gen files * fix proto gen files * remove 3thrparty mod * thr modules openapi * add xos copy commands * fix wrong proto tmp path * remove unused method * update tools for the doctor command * unhlanded error * check if the buf files exists * remove unused ctx * fix changelog merge * fix unit tests and make more dynamic * add support for new app.go v2 * remove chain warnings from logs * use custom buffer instead bytes.buffer * Update changelog Co-authored-by: İlker G. Öztürk <[email protected]> * inject custom module * fix ts script generation and remove pulsar buf files * remove params from module and bump sdk and ibc * app.go v2 * add changelog * add pulsar protobuf support * fix changelog * fix changelog * add msg update params * update change log * add custom parameters * remove upgrade handlers * remove the keeper as a pointer * add custom parameters default keys * add pulsar module config to appconfig and fix import not exist for module v1 * add missing placeholder and remove unused replacer parameter * remove unused placeholders * remove unused placeholders * add missing imports for IBC modules * add ibc to app.go * fix changelog * fix ibc templates for appwiring * inject ibc keepers * remove warning * ADD IBC TO GOV ROUTE KEEPER * fix ibckeeper injection * fix testutil for ibc module * update goversion * update lint version * fix goversion * downgrade lint version * add pulsar to the tools file * fix tests for app.go implementations * fix doctor command * update lint * use sdkerrors codes * use deprecated sdkerrors * add migration for scaffold and generate commands * fix pre handler * fix rance condition * fix wrong app path for tools migrations * rollback lint version * fix lint * rollback draft changes * fix ineffassign lint * fix wrong path * fix deprecated rand seed * remove unused code * assert simulation app name * decrease the size of the test chain name * fix setup msg server keeper * fix wrong keeper name * exclude module.proto from go proto generation * fix wrong keeper arg pointer * fix missing sdk import * fix wrong imports * fix missing import * move buf pkg to cosmosbuf * fix doctor tools test * fix dependencie bank perm * add default expected keepers * create generate proto-pulsar commands * bump ibc-go * remove unused module * replace cosmossdk.io/simapp/params to github.com/cosmos/cosmos-sdk/types/module/testutil * remove unused workaround * fix relative path for appPath * use default rand * rollback checkBufFiles method * set params for testutil * use short name for integrastion test modules * change slashing keep interface to avoid conflict with the staking keeper * fix tx module name for intagration tests * remove some typos * update buf version * exclude module.proto file to generate ts * refactor: validate SDK version and deprecate `sdkerrors.Wrap` (#3602) * feat: change scaffold commands to validate supported SDK version Validation was added to pre run handler to avoid applying buff or other migrations when the app is using an older SDK version. * refactor: fix deprecated `sdkerrors.Wrap` calls in app templates * fix: correct app path in scaffold pre run handler * fix: correct app template imports for SDK errors * fix: correct `errorsmod.Wrapf` error wrapping argument * test: increased integration test timeout to 20m --------- Co-authored-by: Jerónimo Albi <[email protected]> Co-authored-by: İlker G. Öztürk <[email protected]> Co-authored-by: Danilo Pantani <[email protected]> Co-authored-by: Pantani <Pantani>
ignite · Aug 17, 2023 · 7d54608 · 7d54608
1 parent 0891ffe
commit 7d54608
Show file tree

Hide file tree

Showing 146 changed files with 3,612 additions and 1,925 deletions.
diff --git a/.github/workflows/gen-docs-cli.yml b/.github/workflows/gen-docs-cli.yml
@@ -13,7 +13,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: '1.20'
 
       - name: Generate CLI Docs
         run: ./scripts/gen-cli-docs

diff --git a/.github/workflows/go-formatting.yml b/.github/workflows/go-formatting.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: '1.20'
 
       - name: Run make format
         run: make format

diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: '1.20'
 
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/setup-go@v4
         if: env.GIT_DIFF
         with:
-          go-version: 1.19
+          go-version: '1.20'
       - name: Run Integration Tests
         if: env.GIT_DIFF
         run: GOSUMDB=off go test -v -timeout 120m ./integration/${{ matrix.test-path }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/setup-go@v4
         if: env.GIT_DIFF
         with:
-          go-version: 1.19
+          go-version: '1.20'
           cache: true
           cache-dependency-path: go.sum
 

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -1,7 +1,7 @@
 FROM gitpod/workspace-full
 
 # Go
-ENV GO_VERSION=1.19.3
+ENV GO_VERSION=1.20.5
 ENV GOPATH=$HOME/go-packages
 ENV GOROOT=$HOME/go
 ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 
 ## prep the base image.
 #
-FROM golang:1.19 as base
+FROM golang:1.20 as base
 
 RUN apt update && \
     apt-get install -y \

diff --git a/changelog.md b/changelog.md
@@ -5,6 +5,11 @@
 ### Features
 
 - [#3476](https://github.com/ignite/cli/pull/3476) Use `buf.build` binary to code generate from proto files
+- [#3536](https://github.com/ignite/cli/pull/3536) Change app.go to v2 and add AppWiring feature
+
+### Changes
+
+- [#3559](https://github.com/ignite/cli/pull/3559) Bump network plugin version to `v0.1.1`
 
 ### Changes
 

diff --git a/docs/docs/03-clients/01-go-client.md b/docs/docs/03-clients/01-go-client.md
@@ -77,7 +77,7 @@ To import dependencies for your package, you can add the following code to the
 ```text title="blogclient/go.mod"
 module blogclient
 
-go 1.19
+go 1.20
 
 require (
 	blog v0.0.0-00010101000000-000000000000

diff --git a/docs/docs/03-clients/03-vue.md b/docs/docs/03-clients/03-vue.md
@@ -136,7 +136,7 @@ properly interact with a Cosmos chain. The address prefix is used to identify
 the chain that the app is connected to, and must match the prefix used by the
 chain.
 
-By default, Ignite creates a chain with the the `cosmos` prefix. If you have
+By default, Ignite creates a chain with the `cosmos` prefix. If you have
 created your chain with `ignite scaffold chain ... --adddress-prefix foo` or
 manually changed the prefix in the source code of the chain, you need to set the
 prefix in the Vue app.

diff --git a/docs/docs/04-network/02-introduction.md b/docs/docs/04-network/02-introduction.md
@@ -17,7 +17,7 @@ anyone can be a coordinator or a validator.
 
 ## Launching a chain on Ignite
 
-Launching with the CLI can be as simple as a few short commands with the the CLI using `ignite network` command
+Launching with the CLI can be as simple as a few short commands with the CLI using `ignite network` command
 namespace.
 
 > **NOTE:** `ignite n` can also be used as a shortcut for `ignite network`.

diff --git a/docs/versioned_docs/version-v0.25.2/guide/03-blog/01-comment-blog.md b/docs/versioned_docs/version-v0.25.2/guide/03-blog/01-comment-blog.md
@@ -149,7 +149,7 @@ In the newly scaffolded `x/blog/keeper/msg_server_create_comment.go` file, you c
 You need to do the following things:
 
 * Create a variable of type `Comment` with title and body from the message
-* Check if the the comment posted for the respective blog id exists and comment is not older than 100 blocks
+* Check if the comment posted for the respective blog id exists and comment is not older than 100 blocks
 * Append this `Comment` to the store
 
 ```go

diff --git a/docs/versioned_docs/version-v0.25.2/guide/05-scavenge/07-keeper.md b/docs/versioned_docs/version-v0.25.2/guide/05-scavenge/07-keeper.md
@@ -180,7 +180,7 @@ func (k msgServer) RevealSolution(goCtx context.Context, msg *types.MsgRevealSol
 	// convert the hash to a string
 	var solutionScavengerHashString = hex.EncodeToString(solutionScavengerHash[:])
 
-	// try getting a commit using the the hash of solution and address
+	// try getting a commit using the hash of solution and address
 	_, isFound := k.GetCommit(ctx, solutionScavengerHashString)
 
 	// return an error if a commit doesn't exist

diff --git a/docs/versioned_docs/version-v0.25.2/network/01-introduction.md b/docs/versioned_docs/version-v0.25.2/network/01-introduction.md
@@ -14,7 +14,7 @@ To launch a Cosmos blockchain you need someone to be a coordinator and others to
 
 ## Launching a chain on Ignite
 
-Launching with the CLI can be as simple as a few short commands with the the CLI using `ignite network` command namespace.
+Launching with the CLI can be as simple as a few short commands with the CLI using `ignite network` command namespace.
 
 > **NOTE:** `ignite n` can also be used as a shortcut for `ignite network`.
 

diff --git a/docs/versioned_docs/version-v0.26.1/03-clients/03-vue.md b/docs/versioned_docs/version-v0.26.1/03-clients/03-vue.md
@@ -136,7 +136,7 @@ properly interact with a Cosmos chain. The address prefix is used to identify
 the chain that the app is connected to, and must match the prefix used by the
 chain.
 
-By default, Ignite creates a chain with the the `cosmos` prefix. If you have
+By default, Ignite creates a chain with the `cosmos` prefix. If you have
 created your chain with `ignite scaffold chain ... --adddress-prefix foo` or
 manually changed the prefix in the source code of the chain, you need to set the
 prefix in the Vue app.

diff --git a/docs/versioned_docs/version-v0.26.1/04-network/02-introduction.md b/docs/versioned_docs/version-v0.26.1/04-network/02-introduction.md
@@ -17,7 +17,7 @@ anyone can be a coordinator or a validator.
 
 ## Launching a chain on Ignite
 
-Launching with the CLI can be as simple as a few short commands with the the CLI using `ignite network` command
+Launching with the CLI can be as simple as a few short commands with the CLI using `ignite network` command
 namespace.
 
 > **NOTE:** `ignite n` can also be used as a shortcut for `ignite network`.

diff --git a/docs/versioned_docs/version-v0.27.1/03-clients/03-vue.md b/docs/versioned_docs/version-v0.27.1/03-clients/03-vue.md
@@ -136,7 +136,7 @@ properly interact with a Cosmos chain. The address prefix is used to identify
 the chain that the app is connected to, and must match the prefix used by the
 chain.
 
-By default, Ignite creates a chain with the the `cosmos` prefix. If you have
+By default, Ignite creates a chain with the `cosmos` prefix. If you have
 created your chain with `ignite scaffold chain ... --adddress-prefix foo` or
 manually changed the prefix in the source code of the chain, you need to set the
 prefix in the Vue app.

diff --git a/docs/versioned_docs/version-v0.27.1/04-network/02-introduction.md b/docs/versioned_docs/version-v0.27.1/04-network/02-introduction.md
@@ -17,7 +17,7 @@ anyone can be a coordinator or a validator.
 
 ## Launching a chain on Ignite
 
-Launching with the CLI can be as simple as a few short commands with the the CLI using `ignite network` command
+Launching with the CLI can be as simple as a few short commands with the CLI using `ignite network` command
 namespace.
 
 > **NOTE:** `ignite n` can also be used as a shortcut for `ignite network`.

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ignite/cli
 
-go 1.19
+go 1.20
 
 require (
 	cosmossdk.io/math v1.0.1

diff --git a/ignite/cmd/generate.go b/ignite/cmd/generate.go
@@ -25,6 +25,7 @@ meant to be edited by hand.
 	flagSetPath(c)
 	flagSetClearCache(c)
 	c.AddCommand(NewGenerateGo())
+	c.AddCommand(NewGeneratePulsar())
 	c.AddCommand(NewGenerateTSClient())
 	c.AddCommand(NewGenerateVuex())
 	c.AddCommand(NewGenerateComposables())

diff --git a/ignite/cmd/generate_pulsar.go b/ignite/cmd/generate_pulsar.go
@@ -0,0 +1,47 @@
+package ignitecmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/ignite/cli/ignite/pkg/cliui"
+	"github.com/ignite/cli/ignite/pkg/cliui/icons"
+	"github.com/ignite/cli/ignite/services/chain"
+)
+
+func NewGeneratePulsar() *cobra.Command {
+	c := &cobra.Command{
+		Use:   "proto-pulsar",
+		Short: "Compile protocol buffer files to Go pulsar source code required by Cosmos SDK",
+		RunE:  generatePulsarHandler,
+	}
+
+	c.Flags().AddFlagSet(flagSetYes())
+
+	return c
+}
+
+func generatePulsarHandler(cmd *cobra.Command, _ []string) error {
+	session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
+	defer session.End()
+
+	c, err := newChainWithHomeFlags(
+		cmd,
+		chain.WithOutputer(session),
+		chain.CollectEvents(session.EventBus()),
+		chain.CheckCosmosSDKVersion(),
+	)
+	if err != nil {
+		return err
+	}
+
+	cacheStorage, err := newCache(cmd)
+	if err != nil {
+		return err
+	}
+
+	if err := c.Generate(cmd.Context(), cacheStorage, chain.GeneratePulsar()); err != nil {
+		return err
+	}
+
+	return session.Println(icons.OK, "Generated Go pulsar code")
+}
diff --git a/ignite/cmd/scaffold.go b/ignite/cmd/scaffold.go
@@ -9,10 +9,12 @@ import (
 	flag "github.com/spf13/pflag"
 
 	"github.com/ignite/cli/ignite/pkg/cliui"
+	"github.com/ignite/cli/ignite/pkg/cosmosver"
 	"github.com/ignite/cli/ignite/pkg/gomodulepath"
 	"github.com/ignite/cli/ignite/pkg/placeholder"
 	"github.com/ignite/cli/ignite/pkg/xgit"
 	"github.com/ignite/cli/ignite/services/scaffolder"
+	"github.com/ignite/cli/ignite/version"
 )
 
 // flags related to component scaffolding.
@@ -129,6 +131,15 @@ func migrationPreRunHandler(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	ver, err := cosmosver.Detect(appPath)
+	if err != nil {
+		return err
+	}
+
+	if err := version.AssertSupportedCosmosSDKVersion(ver); err != nil {
+		return err
+	}
+
 	if err := toolsMigrationPreRunHandler(cmd, session, appPath); err != nil {
 		return err
 	}

diff --git a/ignite/cmd/scaffold_chain.go b/ignite/cmd/scaffold_chain.go
@@ -1,6 +1,8 @@
 package ignitecmd
 
 import (
+	"errors"
+
 	"github.com/spf13/cobra"
 
 	"github.com/ignite/cli/ignite/pkg/cliui"
@@ -77,6 +79,7 @@ about Cosmos SDK on https://docs.cosmos.network
 	c.Flags().AddFlagSet(flagSetAccountPrefixes())
 	c.Flags().StringP(flagPath, "p", "", "create a project in a specific path")
 	c.Flags().Bool(flagNoDefaultModule, false, "create a project without a default module")
+	c.Flags().StringSlice(flagParams, []string{}, "add default module parameters")
 	c.Flags().Bool(flagSkipGit, false, "skip Git repository initialization")
 
 	return c
@@ -94,6 +97,14 @@ func scaffoldChainHandler(cmd *cobra.Command, args []string) error {
 		skipGit, _         = cmd.Flags().GetBool(flagSkipGit)
 	)
 
+	params, err := cmd.Flags().GetStringSlice(flagParams)
+	if err != nil {
+		return err
+	}
+	if noDefaultModule && len(params) > 0 {
+		return errors.New("params flag is only supported if the default module is enabled")
+	}
+
 	cacheStorage, err := newCache(cmd)
 	if err != nil {
 		return err
@@ -108,6 +119,7 @@ func scaffoldChainHandler(cmd *cobra.Command, args []string) error {
 		addressPrefix,
 		noDefaultModule,
 		skipGit,
+		params,
 	)
 	if err != nil {
 		return err

diff --git a/ignite/cmd/scaffold_mwasm.go b/ignite/cmd/scaffold_mwasm.go
diff --git a/ignite/config/plugins/testdata/localplugin/example/go.mod b/ignite/config/plugins/testdata/localplugin/example/go.mod
@@ -1,3 +1,3 @@
 module github.com/ignite/example
 
-go 1.19
+go 1.20
diff --git a/ignite/pkg/availableport/availableport.go b/ignite/pkg/availableport/availableport.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"math/rand"
 	"net"
-	"time"
 )
 
 // Find finds n number of unused ports.
@@ -16,7 +15,6 @@ func Find(n int) (ports []int, err error) {
 
 	for i := 0; i < n; i++ {
 		for {
-			rand.Seed(time.Now().UnixNano())
 			port := rand.Intn(max-min+1) + min
 
 			conn, err := net.Dial("tcp", fmt.Sprintf(":%d", port))