feat(templates): upgrade interchain-security to v5 (#4110)

ignite · May 29, 2024 · 4398c9b · 4398c9b
1 parent 8940abd
commit 4398c9b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/changelog.md b/changelog.md
@@ -15,6 +15,7 @@
 - [#3718](https://github.com/ignite/cli/pull/3718) Add `gen-mig-diffs` tool app to compare scaffold output of two versions of ignite
 - [#4077](https://github.com/ignite/cli/pull/4077) Merge the swagger files manually instead use nodetime `swagger-combine`
 - [#4100](https://github.com/ignite/cli/pull/4100) Set the `proto-dir` flag only for the `scaffold chain` command and use the proto path from the config
+- [#4110](https://github.com/ignite/cli/pull/4110) Scaffold a consumer chain with `interchain-security` v5.0.0-rc0.
 - [#4111](https://github.com/ignite/cli/pull/4111) Remove vuex generation
 
 ### Changes

diff --git a/ignite/internal/plugin/consumer.go b/ignite/internal/plugin/consumer.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	PluginConsumerVersion = "consumer/v0.1.0"
+	PluginConsumerVersion = "consumer/v0.2.0"
 	PluginConsumerPath    = "github.com/ignite/apps/consumer@" + PluginConsumerVersion
 )
 

diff --git a/ignite/templates/app/files-consumer/app/ante_handler.go.plush b/ignite/templates/app/files-consumer/app/ante_handler.go.plush
@@ -9,8 +9,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
-	consumerante "github.com/cosmos/interchain-security/v3/app/consumer/ante"
-	ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
+	consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante"
+	ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC channel keeper.

diff --git a/ignite/templates/app/files-consumer/app/app.go.plush b/ignite/templates/app/files-consumer/app/app.go.plush
@@ -65,8 +65,8 @@ import (
 	ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
-	ibcconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+	ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
+	ibcconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
 
 	"<%= ModulePath %>/docs"
 )

diff --git a/ignite/templates/app/files-consumer/app/app_config.go.plush b/ignite/templates/app/files-consumer/app/app_config.go.plush
@@ -44,7 +44,7 @@ import (
 	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	"google.golang.org/protobuf/types/known/durationpb"
-	ibcconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
+	ibcconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
 )
 
 var (

diff --git a/ignite/templates/app/files-consumer/app/ibc.go.plush b/ignite/templates/app/files-consumer/app/ibc.go.plush
@@ -34,10 +34,10 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	solomachine "github.com/cosmos/ibc-go/v8/modules/light-clients/06-solomachine"
 	ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
-	ibcconsumer "github.com/cosmos/interchain-security/v3/x/ccv/consumer"
-	ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
-	ibcconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
-	ibcccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
+	ibcconsumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer"
+	ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
+	ibcconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
+	ibcccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types"
 	// this line is used by starport scaffolding # ibc/app/import
 )
 

diff --git a/ignite/templates/app/files/go.mod.plush b/ignite/templates/app/files/go.mod.plush
@@ -25,7 +25,7 @@ require (
 	cosmossdk.io/x/nft v0.1.0
 	cosmossdk.io/x/upgrade v0.1.1
 	<%= if (IsConsumerChain) { %>
-	github.com/cosmos/interchain-security/v3 v3.2.0-consumer-rc0.0.20231123140529-1819e73f6197
+	github.com/cosmos/interchain-security/v5 v5.0.0-rc0
 	<% } %>
 	github.com/bufbuild/buf v1.30.1
 	github.com/cometbft/cometbft v0.38.6
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ import ( @@
     )
     const (
-    	PluginConsumerVersion = "consumer/v0.1.0"
+    	PluginConsumerVersion = "consumer/v0.2.0"
     	PluginConsumerPath    = "github.com/ignite/apps/consumer@" + PluginConsumerVersion
     )
@@ Expand Down @@