Skip to content

Commit

Permalink
feat(templates): upgrade interchain-security to v5 (#4110)
Browse files Browse the repository at this point in the history
(cherry picked from commit 6bd9fbd)

# Conflicts:
#	ignite/templates/app/files-consumer/app/app.go.plush
#	ignite/templates/app/files-consumer/app/app_config.go.plush
  • Loading branch information
julienrbrt authored and mergify[bot] committed May 7, 2024
1 parent 59ab87f commit f9bab91
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 8 deletions.
13 changes: 13 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@
### Features

- [#4108](https://github.com/ignite/cli/pull/4108) Add `xast` package (cherry-picked from [#3770](https://github.com/ignite/cli/pull/3770))
- [#3707](https://github.com/ignite/cli/pull/3707) Add collections support.
- [#3977](https://github.com/ignite/cli/pull/3977) Add `chain lint` command to lint the chain's codebase using `golangci-lint`
- [#3770](https://github.com/ignite/cli/pull/3770) Add `scaffold configs` and `scaffold params` commands
- [#4001](https://github.com/ignite/cli/pull/4001) Improve `xgenny` dry run
- [#3967](https://github.com/ignite/cli/issues/3967) Add HD wallet parameters `address index` and `account number` to the chain account config
- [#4004](https://github.com/ignite/cli/pull/4004) Remove all import placeholders using the `xast` pkg
- [#4076](https://github.com/ignite/cli/pull/4076) Remove the ignite `relayer` and `tools` commands with all ts-relayer logic
- [#4071](https://github.com/ignite/cli/pull/4071) Support custom proto path
- [#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

Expand Down
2 changes: 1 addition & 1 deletion ignite/internal/plugin/consumer.go
Original file line number Diff 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
4 changes: 2 additions & 2 deletions ignite/templates/app/files-consumer/app/ante_handler.go.plush
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions ignite/templates/app/files-consumer/app/app.go.plush
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,14 @@ 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"
<<<<<<< HEAD
ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
ibcconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
// this line is used by starport scaffolding # stargate/app/moduleImport
=======
ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
ibcconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
>>>>>>> 6bd9fbdf (feat(templates): upgrade `interchain-security` to v5 (#4110))

"<%= ModulePath %>/docs"
)
Expand Down
4 changes: 4 additions & 0 deletions ignite/templates/app/files-consumer/app/app_config.go.plush
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,12 @@ 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"
<<<<<<< HEAD
ibcconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
// this line is used by starport scaffolding # stargate/app/moduleImport
=======
ibcconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
>>>>>>> 6bd9fbdf (feat(templates): upgrade `interchain-security` to v5 (#4110))
)

var (
Expand Down
8 changes: 4 additions & 4 deletions ignite/templates/app/files-consumer/app/ibc.go.plush
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion ignite/templates/app/files/go.mod.plush
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f9bab91

Please sign in to comment.