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

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

Merged
merged 7 commits into from
May 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35b8f78
chore(templates): upgrade `interchain-security` to v5
julienrbrt Apr 26, 2024
ec1b102
upgrades
julienrbrt Apr 26, 2024
eda0464
Merge branch 'main' into julien/upgrade-interchain-security
Pantani Apr 29, 2024
a692a4d
Merge branch 'main' into julien/upgrade-interchain-security
julienrbrt May 3, 2024
8f088f6
update tag
julienrbrt May 3, 2024
1ebf4b9
Merge branch 'main' into julien/upgrade-interchain-security
julienrbrt May 3, 2024
ad65d50
Merge branch 'main' into julien/upgrade-interchain-security
julienrbrt May 5, 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 @@ -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
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"

"<%= 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"
)

var (
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.1
github.com/cometbft/cometbft v0.38.6
Expand Down
Loading