Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
May 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9bab91
feat(templates): upgrade `interchain-security` to v5 (#4110)
julienrbrt May 7, 2024
92f1b26
fixes
julienrbrt May 7, 2024
f2fc195
updates
julienrbrt May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ignite/internal/plugin/consumer.go
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ignite/templates/app/files-consumer/app/app.go.plush
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ignite/templates/app/files-consumer/app/app_config.go.plush
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
8 changes: 4 additions & 4 deletions ignite/templates/app/files-consumer/app/ibc.go.plush
View file
Open in desktop
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
View file
Open in desktop
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
Loading