From a4fcc7ddb09b322f6d83345e45a665b2b72f8c91 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 11 Sep 2024 12:38:31 +0200 Subject: [PATCH 1/3] chore: bump ibc to 8.5.0 (#4341) * chore: bump ibc to 8.5.0 * cl * use pseudo version until 8.5.1 (cherry picked from commit 05681456db25910fdd594c8a3d8974f26c1b0e96) # Conflicts: # ignite/templates/app/files/go.mod.plush --- changelog.md | 21 +++++++++++++++++++ ignite/templates/app/files/go.mod.plush | 27 +++++++++++++++++-------- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/changelog.md b/changelog.md index f3db04daaa..bff80b017e 100644 --- a/changelog.md +++ b/changelog.md @@ -11,6 +11,27 @@ ### Changes - [#4292](https://github.com/ignite/cli/pull/4292) Bump Cosmos SDK to `v0.50.9` +- [#4094](https://github.com/ignite/cli/pull/4094) Scaffolding a multi-index map using `ignite s map foo bar baz --index foobar,foobaz` is no longer supported. Use one index instead of use `collections.IndexedMap`. +- [#4058](https://github.com/ignite/cli/pull/4058) Simplify scaffolded modules by including `ValidateBasic()` logic in message handler. +- [#4058](https://github.com/ignite/cli/pull/4058) Use `address.Codec` instead of `AccAddressFromBech32`. +- [#3993](https://github.com/ignite/cli/pull/3993) Oracle scaffolding was deprecated and has been removed +- [#3962](https://github.com/ignite/cli/pull/3962) Rename all RPC endpoints and autocli commands generated for `map`/`list`/`single` types +- [#3976](https://github.com/ignite/cli/pull/3976) Remove error checks for Cobra command value get calls +- [#4002](https://github.com/ignite/cli/pull/4002) Bump buf build +- [#4008](https://github.com/ignite/cli/pull/4008) Rename `pkg/yaml` to `pkg/xyaml` +- [#4075](https://github.com/ignite/cli/pull/4075) Use `gopkg.in/yaml.v3` instead `gopkg.in/yaml.v2` +- [#4118](https://github.com/ignite/cli/pull/4118) Version scaffolded protos as `v1` to follow SDK structure. +- [#4167](https://github.com/ignite/cli/pull/4167) Scaffold `int64` instead of `int32` when a field type is `int` +- [#4159](https://github.com/ignite/cli/pull/4159) Enable gci linter +- [#4160](https://github.com/ignite/cli/pull/4160) Enable copyloopvar linter +- [#4162](https://github.com/ignite/cli/pull/4162) Enable errcheck linter +- [#4189](https://github.com/ignite/cli/pull/4189) Deprecate `ignite node` for `ignite connect` app +- [#4290](https://github.com/ignite/cli/pull/4290) Remove ignite ics logic from ignite cli (this functionality will be in the `consumer` app) +- [#4295](https://github.com/ignite/cli/pull/4295) Stop scaffolding `pulsar` files +- [#4322](https://github.com/ignite/cli/pull/4322) Create a message for authenticate buf for generate ts-client +- [#4319](https://github.com/ignite/cli/pull/4319) Remove fee abstraction module from open api code generation +- [#4317](https://github.com/ignite/cli/pull/4317) Remove xchisel dependency +- [#4341](https://github.com/ignite/cli/pull/4341) Bump `ibc-go` to `8.5.0` - [#4345](https://github.com/ignite/cli/pull/4345) Added survey link ### Fixes diff --git a/ignite/templates/app/files/go.mod.plush b/ignite/templates/app/files/go.mod.plush index a493a54c4c..bee2f4c1ed 100644 --- a/ignite/templates/app/files/go.mod.plush +++ b/ignite/templates/app/files/go.mod.plush @@ -16,15 +16,16 @@ require ( cosmossdk.io/core v0.11.1 cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 - cosmossdk.io/log v1.3.1 + cosmossdk.io/log v1.4.0 cosmossdk.io/math v1.3.0 cosmossdk.io/store v1.1.0 - cosmossdk.io/tools/confix v0.1.1 - cosmossdk.io/x/circuit v0.1.0 - cosmossdk.io/x/evidence v0.1.0 - cosmossdk.io/x/feegrant v0.1.0 + cosmossdk.io/tools/confix v0.1.2 + cosmossdk.io/x/circuit v0.1.1 + cosmossdk.io/x/evidence v0.1.1 + cosmossdk.io/x/feegrant v0.1.1 cosmossdk.io/x/nft v0.1.0 cosmossdk.io/x/upgrade v0.1.4 +<<<<<<< HEAD <%= if (IsConsumerChain) { %> github.com/cosmos/interchain-security/v5 v5.0.0 <% } %> @@ -36,17 +37,27 @@ require ( github.com/cosmos/gogoproto v1.5.0 github.com/cosmos/ibc-go/modules/capability v1.0.0 github.com/cosmos/ibc-go/v8 v8.3.1 +======= + github.com/bufbuild/buf v1.32.1 + github.com/cometbft/cometbft v0.38.11 + github.com/cosmos/cosmos-db v1.0.2 + github.com/cosmos/cosmos-proto v1.0.0-beta.5 + github.com/cosmos/cosmos-sdk v0.50.9 + github.com/cosmos/gogoproto v1.7.0 + github.com/cosmos/ibc-go/modules/capability v1.0.1 + github.com/cosmos/ibc-go/v8 v8.5.1-0.20240911080511-34a0d0147847 +>>>>>>> 05681456 (chore: bump ibc to 8.5.0 (#4341)) github.com/golang/protobuf v1.5.4 github.com/gorilla/mux v1.8.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 github.com/spf13/cast v1.6.0 - github.com/spf13/cobra v1.8.0 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d - google.golang.org/genproto/googleapis/api v0.0.0-20240515191416-fc5f0ca64291 + golang.org/x/tools v0.22.0 + google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d google.golang.org/grpc v1.64.1 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 google.golang.org/protobuf v1.34.2 From 74e77b69e07f4c8559a92d734ba0453c21aea857 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 11 Sep 2024 14:36:13 +0200 Subject: [PATCH 2/3] updates --- changelog.md | 22 +--------------------- ignite/templates/app/files/go.mod.plush | 11 ----------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/changelog.md b/changelog.md index bff80b017e..a13ce4ca1a 100644 --- a/changelog.md +++ b/changelog.md @@ -11,27 +11,6 @@ ### Changes - [#4292](https://github.com/ignite/cli/pull/4292) Bump Cosmos SDK to `v0.50.9` -- [#4094](https://github.com/ignite/cli/pull/4094) Scaffolding a multi-index map using `ignite s map foo bar baz --index foobar,foobaz` is no longer supported. Use one index instead of use `collections.IndexedMap`. -- [#4058](https://github.com/ignite/cli/pull/4058) Simplify scaffolded modules by including `ValidateBasic()` logic in message handler. -- [#4058](https://github.com/ignite/cli/pull/4058) Use `address.Codec` instead of `AccAddressFromBech32`. -- [#3993](https://github.com/ignite/cli/pull/3993) Oracle scaffolding was deprecated and has been removed -- [#3962](https://github.com/ignite/cli/pull/3962) Rename all RPC endpoints and autocli commands generated for `map`/`list`/`single` types -- [#3976](https://github.com/ignite/cli/pull/3976) Remove error checks for Cobra command value get calls -- [#4002](https://github.com/ignite/cli/pull/4002) Bump buf build -- [#4008](https://github.com/ignite/cli/pull/4008) Rename `pkg/yaml` to `pkg/xyaml` -- [#4075](https://github.com/ignite/cli/pull/4075) Use `gopkg.in/yaml.v3` instead `gopkg.in/yaml.v2` -- [#4118](https://github.com/ignite/cli/pull/4118) Version scaffolded protos as `v1` to follow SDK structure. -- [#4167](https://github.com/ignite/cli/pull/4167) Scaffold `int64` instead of `int32` when a field type is `int` -- [#4159](https://github.com/ignite/cli/pull/4159) Enable gci linter -- [#4160](https://github.com/ignite/cli/pull/4160) Enable copyloopvar linter -- [#4162](https://github.com/ignite/cli/pull/4162) Enable errcheck linter -- [#4189](https://github.com/ignite/cli/pull/4189) Deprecate `ignite node` for `ignite connect` app -- [#4290](https://github.com/ignite/cli/pull/4290) Remove ignite ics logic from ignite cli (this functionality will be in the `consumer` app) -- [#4295](https://github.com/ignite/cli/pull/4295) Stop scaffolding `pulsar` files -- [#4322](https://github.com/ignite/cli/pull/4322) Create a message for authenticate buf for generate ts-client -- [#4319](https://github.com/ignite/cli/pull/4319) Remove fee abstraction module from open api code generation -- [#4317](https://github.com/ignite/cli/pull/4317) Remove xchisel dependency -- [#4341](https://github.com/ignite/cli/pull/4341) Bump `ibc-go` to `8.5.0` - [#4345](https://github.com/ignite/cli/pull/4345) Added survey link ### Fixes @@ -40,6 +19,7 @@ - [#4309](https://github.com/ignite/cli/pull/4309) Fix chain id for chain simulations - [#4322](https://github.com/ignite/cli/pull/4322) Create a message for authenticate buf for generate ts-client - [#4323](https://github.com/ignite/cli/pull/4323) Add missing `--config` handling in the `chain` commands +- [#4350](https://github.com/ignite/cli/pull/4350) Skip upgrade prefix for sim tests ## [`v28.5.1`](https://github.com/ignite/cli/releases/tag/v28.5.1) diff --git a/ignite/templates/app/files/go.mod.plush b/ignite/templates/app/files/go.mod.plush index bee2f4c1ed..11caef98ff 100644 --- a/ignite/templates/app/files/go.mod.plush +++ b/ignite/templates/app/files/go.mod.plush @@ -25,20 +25,10 @@ require ( cosmossdk.io/x/feegrant v0.1.1 cosmossdk.io/x/nft v0.1.0 cosmossdk.io/x/upgrade v0.1.4 -<<<<<<< HEAD <%= if (IsConsumerChain) { %> github.com/cosmos/interchain-security/v5 v5.0.0 <% } %> github.com/bufbuild/buf v1.34.0 - github.com/cometbft/cometbft v0.38.10 - github.com/cosmos/cosmos-db v1.0.2 - github.com/cosmos/cosmos-proto v1.0.0-beta.5 - github.com/cosmos/cosmos-sdk v0.50.9 - github.com/cosmos/gogoproto v1.5.0 - github.com/cosmos/ibc-go/modules/capability v1.0.0 - github.com/cosmos/ibc-go/v8 v8.3.1 -======= - github.com/bufbuild/buf v1.32.1 github.com/cometbft/cometbft v0.38.11 github.com/cosmos/cosmos-db v1.0.2 github.com/cosmos/cosmos-proto v1.0.0-beta.5 @@ -46,7 +36,6 @@ require ( github.com/cosmos/gogoproto v1.7.0 github.com/cosmos/ibc-go/modules/capability v1.0.1 github.com/cosmos/ibc-go/v8 v8.5.1-0.20240911080511-34a0d0147847 ->>>>>>> 05681456 (chore: bump ibc to 8.5.0 (#4341)) github.com/golang/protobuf v1.5.4 github.com/gorilla/mux v1.8.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 From afb3f97cf122ff795df36b2da1785fac75322f27 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 11 Sep 2024 14:52:15 +0200 Subject: [PATCH 3/3] updates --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index a13ce4ca1a..de625d5584 100644 --- a/changelog.md +++ b/changelog.md @@ -11,6 +11,7 @@ ### Changes - [#4292](https://github.com/ignite/cli/pull/4292) Bump Cosmos SDK to `v0.50.9` +- [#4341](https://github.com/ignite/cli/pull/4341) Bump `ibc-go` to `8.5.0` - [#4345](https://github.com/ignite/cli/pull/4345) Added survey link ### Fixes