From 7f1b5643d6595a169f7e7dc70af30ad8809faad8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 00:01:24 +0200 Subject: [PATCH] feat(templates): upgrade `interchain-security` to v5 (backport #4110) (#4120) * feat(templates): upgrade `interchain-security` to v5 (#4110) (cherry picked from commit 6bd9fbdf97b2a25e9dc674f3d5ed34d21aef9828) # Conflicts: # ignite/templates/app/files-consumer/app/app.go.plush # ignite/templates/app/files-consumer/app/app_config.go.plush * fixes * updates --------- Co-authored-by: Julien Robert --- changelog.md | 1 + ignite/internal/plugin/consumer.go | 2 +- .../app/files-consumer/app/ante_handler.go.plush | 4 ++-- ignite/templates/app/files-consumer/app/app.go.plush | 4 ++-- .../templates/app/files-consumer/app/app_config.go.plush | 2 +- ignite/templates/app/files-consumer/app/ibc.go.plush | 8 ++++---- ignite/templates/app/files/go.mod.plush | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/changelog.md b/changelog.md index 1dc05857c0..3b0671acdf 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,7 @@ ### Features - [#4108](https://github.com/ignite/cli/pull/4108) Add `xast` package (cherry-picked from [#3770](https://github.com/ignite/cli/pull/3770)) +- [#4110](https://github.com/ignite/cli/pull/4110) Scaffold a consumer chain with `interchain-security` v5.0.0-rc0. ### Changes diff --git a/ignite/internal/plugin/consumer.go b/ignite/internal/plugin/consumer.go index 9bc8c4690d..375cf5db69 100644 --- 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 index de1c4ecca8..d5c2342968 100644 --- 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 index fac3700686..2429c7deae 100644 --- 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" // this line is used by starport scaffolding # stargate/app/moduleImport "<%= 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 index 669b0fc6cc..3aaec21a9d 100644 --- 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" // this line is used by starport scaffolding # stargate/app/moduleImport ) diff --git a/ignite/templates/app/files-consumer/app/ibc.go.plush b/ignite/templates/app/files-consumer/app/ibc.go.plush index 5c8c756d8b..4dc83f001c 100644 --- 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 index 517de5804a..80f62c4196 100644 --- 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.0 github.com/cometbft/cometbft v0.38.6