From 2dba9d471ef73b0a99e844bf55a44ddae700ea06 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 19:23:29 +0200 Subject: [PATCH] feat!: bump ICS to v6.1.0 (backport #3350) (#3354) * feat!: bump ICS to v6.1.0 (#3350) * add ICS with patch * go mod tidy * bump ICS * bump ICS * bump ICS to v6.1.0-rc0 * update changelog entries * bump ICS to v6.1.0 (cherry picked from commit 3ce3c5bc87a68a3f2e57562a120e0e5e7407aa51) # Conflicts: # .changelog/unreleased/features/3335-bump-ics.md # .changelog/v20.0.0/api-breaking/3335-bump-ics.md # .changelog/v20.0.0/api-breaking/3350-bump-ics.md # .changelog/v20.0.0/dependencies/3335-bump-ics.md # .changelog/v20.0.0/dependencies/3350-bump-ics.md # .changelog/v20.0.0/features/3335-bump-ics.md # .changelog/v20.0.0/features/3350-bump-ics.md # .changelog/v20.0.0/state-breaking/3335-bump-ics.md # .changelog/v20.0.0/state-breaking/3350-bump-ics.md * fix backport * update changelog * update release notes --------- Co-authored-by: Marius Poke --- .../v20.0.0/api-breaking/3335-bump-ics.md | 5 ----- .../v20.0.0/api-breaking/3350-bump-ics.md | 5 +++++ .../v20.0.0/dependencies/3335-bump-ics.md | 3 --- .../v20.0.0/dependencies/3350-bump-ics.md | 3 +++ .../{3335-bump-ics.md => 3350-bump-ics.md} | 4 ++-- .../v20.0.0/state-breaking/3335-bump-ics.md | 3 --- .../v20.0.0/state-breaking/3350-bump-ics.md | 3 +++ CHANGELOG.md | 20 +++++++++---------- RELEASE_NOTES.md | 4 ++-- go.mod | 4 ++-- go.sum | 8 ++++---- 11 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 .changelog/v20.0.0/api-breaking/3335-bump-ics.md create mode 100644 .changelog/v20.0.0/api-breaking/3350-bump-ics.md delete mode 100644 .changelog/v20.0.0/dependencies/3335-bump-ics.md create mode 100644 .changelog/v20.0.0/dependencies/3350-bump-ics.md rename .changelog/v20.0.0/features/{3335-bump-ics.md => 3350-bump-ics.md} (64%) delete mode 100644 .changelog/v20.0.0/state-breaking/3335-bump-ics.md create mode 100644 .changelog/v20.0.0/state-breaking/3350-bump-ics.md diff --git a/.changelog/v20.0.0/api-breaking/3335-bump-ics.md b/.changelog/v20.0.0/api-breaking/3335-bump-ics.md deleted file mode 100644 index 6e4d461931..0000000000 --- a/.changelog/v20.0.0/api-breaking/3335-bump-ics.md +++ /dev/null @@ -1,5 +0,0 @@ -- Bump [ICS](https://github.com/cosmos/interchain-security) to - [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0). - This release of ICS introduces several API breaking changes. - See the [ICS changelog](https://github.com/cosmos/interchain-security/blob/v6.0.0/CHANGELOG.md#api-breaking) for details. - ([\#3335](https://github.com/cosmos/gaia/pull/3335)) diff --git a/.changelog/v20.0.0/api-breaking/3350-bump-ics.md b/.changelog/v20.0.0/api-breaking/3350-bump-ics.md new file mode 100644 index 0000000000..7ec39bdbcc --- /dev/null +++ b/.changelog/v20.0.0/api-breaking/3350-bump-ics.md @@ -0,0 +1,5 @@ +- Bump [ICS](https://github.com/cosmos/interchain-security) to + [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0). + This release of ICS introduces several API breaking changes. + See the [ICS changelog](https://github.com/cosmos/interchain-security/blob/v6.1.0/CHANGELOG.md#api-breaking) for details. + ([\#3350](https://github.com/cosmos/gaia/pull/3350)) diff --git a/.changelog/v20.0.0/dependencies/3335-bump-ics.md b/.changelog/v20.0.0/dependencies/3335-bump-ics.md deleted file mode 100644 index a7bbf8a4a1..0000000000 --- a/.changelog/v20.0.0/dependencies/3335-bump-ics.md +++ /dev/null @@ -1,3 +0,0 @@ -- Bump [ICS](https://github.com/cosmos/interchain-security) to - [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0). - ([\#3335](https://github.com/cosmos/gaia/pull/3335)) diff --git a/.changelog/v20.0.0/dependencies/3350-bump-ics.md b/.changelog/v20.0.0/dependencies/3350-bump-ics.md new file mode 100644 index 0000000000..ab0b2a7d61 --- /dev/null +++ b/.changelog/v20.0.0/dependencies/3350-bump-ics.md @@ -0,0 +1,3 @@ +- Bump [ICS](https://github.com/cosmos/interchain-security) to + [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0). + ([\#3350](https://github.com/cosmos/gaia/pull/3350)) diff --git a/.changelog/v20.0.0/features/3335-bump-ics.md b/.changelog/v20.0.0/features/3350-bump-ics.md similarity index 64% rename from .changelog/v20.0.0/features/3335-bump-ics.md rename to .changelog/v20.0.0/features/3350-bump-ics.md index eb0032908c..1abb66dae2 100644 --- a/.changelog/v20.0.0/features/3335-bump-ics.md +++ b/.changelog/v20.0.0/features/3350-bump-ics.md @@ -1,6 +1,6 @@ - Bump [ICS](https://github.com/cosmos/interchain-security) to - [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0). + [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0). This release of ICS enables the permissionless creation of consumer chains and allows validators outside the active validator set to opt in to validate on consumer chains. - ([\#3335](https://github.com/cosmos/gaia/pull/3335)) + ([\#3350](https://github.com/cosmos/gaia/pull/3350)) diff --git a/.changelog/v20.0.0/state-breaking/3335-bump-ics.md b/.changelog/v20.0.0/state-breaking/3335-bump-ics.md deleted file mode 100644 index a7bbf8a4a1..0000000000 --- a/.changelog/v20.0.0/state-breaking/3335-bump-ics.md +++ /dev/null @@ -1,3 +0,0 @@ -- Bump [ICS](https://github.com/cosmos/interchain-security) to - [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0). - ([\#3335](https://github.com/cosmos/gaia/pull/3335)) diff --git a/.changelog/v20.0.0/state-breaking/3350-bump-ics.md b/.changelog/v20.0.0/state-breaking/3350-bump-ics.md new file mode 100644 index 0000000000..ab0b2a7d61 --- /dev/null +++ b/.changelog/v20.0.0/state-breaking/3350-bump-ics.md @@ -0,0 +1,3 @@ +- Bump [ICS](https://github.com/cosmos/interchain-security) to + [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0). + ([\#3350](https://github.com/cosmos/gaia/pull/3350)) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2f16957b8..31abeef47e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,10 @@ ### API BREAKING - Bump [ICS](https://github.com/cosmos/interchain-security) to - [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0). + [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0). This release of ICS introduces several API breaking changes. - See the [ICS changelog](https://github.com/cosmos/interchain-security/blob/v6.0.0/CHANGELOG.md#api-breaking) for details. - ([\#3335](https://github.com/cosmos/gaia/pull/3335)) + See the [ICS changelog](https://github.com/cosmos/interchain-security/blob/v6.1.0/CHANGELOG.md#api-breaking) for details. + ([\#3350](https://github.com/cosmos/gaia/pull/3350)) ### BUG FIXES @@ -25,12 +25,12 @@ - Bump [feemarket](https://github.com/skip-mev/feemarket) to [v1.1.1](https://github.com/skip-mev/feemarket/releases/tag/v1.1.1) ([3306](https://github.com/cosmos/gaia/pull/3306)) -- Bump [ICS](https://github.com/cosmos/interchain-security) to - [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0). - ([\#3335](https://github.com/cosmos/gaia/pull/3335)) - Bump [ibc-go](https://github.com/cosmos/ibc-go) to [v8.5.1](https://github.com/cosmos/ibc-go/releases/tag/v8.5.1) ([\#3338](https://github.com/cosmos/gaia/pull/3338)) +- Bump [ICS](https://github.com/cosmos/interchain-security) to + [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0). + ([\#3350](https://github.com/cosmos/gaia/pull/3350)) ### FEATURES @@ -49,11 +49,11 @@ introduced by the permissionless ICS feature. ([\#3316](https://github.com/cosmos/gaia/pull/3316)) - Bump [ICS](https://github.com/cosmos/interchain-security) to - [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0). + [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0). This release of ICS enables the permissionless creation of consumer chains and allows validators outside the active validator set to opt in to validate on consumer chains. - ([\#3335](https://github.com/cosmos/gaia/pull/3335)) + ([\#3350](https://github.com/cosmos/gaia/pull/3350)) ### STATE BREAKING @@ -78,8 +78,8 @@ introduced by the permissionless ICS feature. ([\#3316](https://github.com/cosmos/gaia/pull/3316)) - Bump [ICS](https://github.com/cosmos/interchain-security) to - [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0). - ([\#3335](https://github.com/cosmos/gaia/pull/3335)) + [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0). + ([\#3350](https://github.com/cosmos/gaia/pull/3350)) ## Previous Versions diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 929f2f7a8a..67a26144dd 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -2,7 +2,7 @@ ## 📝 Changelog -Check out the [changelog](https://github.com/cosmos/gaia/blob/v20.0.0/CHANGELOG.md) for a list of relevant changes or [compare all changes](https://github.com/cosmos/gaia/compare/...v20.0.0) from last release. +Check out the [changelog](https://github.com/cosmos/gaia/blob/v20.0.0/CHANGELOG.md) for a list of relevant changes or [compare all changes](https://github.com/cosmos/gaia/compare/v19.2.0...v20.0.0) from last release. Refer to the [upgrading guide](https://github.com/cosmos/gaia/blob/release/v20.x/UPGRADING.md) when migrating from `v19.2.x` to `v20.x`. @@ -11,7 +11,7 @@ Refer to the [upgrading guide](https://github.com/cosmos/gaia/blob/release/v20.x -This release bumps Interchain Security (ICS) to [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0) which brings the following major features: +This release bumps Interchain Security (ICS) to [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0) which brings the following major features: - ICS with Inactive Validators (as per [prop 930](https://www.mintscan.io/cosmos/proposals/930)) enables validators from outside the Hub’s active set to validate on Consumer Chains. - Permissionless ICS (as per [prop 945](https://www.mintscan.io/cosmos/proposals/945)) enables users to permissionlessly launch opt-in Consumer Chains on the Cosmos Hub. diff --git a/go.mod b/go.mod index 1c244e036b..9b136e0f5e 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/cosmos/ibc-apps/modules/rate-limiting/v8 v8.0.0 github.com/cosmos/ibc-go/modules/capability v1.0.1 github.com/cosmos/ibc-go/v8 v8.5.1 - github.com/cosmos/interchain-security/v6 v6.0.0 + github.com/cosmos/interchain-security/v6 v6.1.0 github.com/google/gofuzz v1.2.0 github.com/gorilla/mux v1.8.1 github.com/ory/dockertest/v3 v3.11.0 @@ -50,7 +50,7 @@ require ( github.com/golang/protobuf v1.5.4 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/grpc v1.66.0 // indirect + google.golang.org/grpc v1.66.2 // indirect ) require ( diff --git a/go.sum b/go.sum index 1f9d70cd27..b09cac5091 100644 --- a/go.sum +++ b/go.sum @@ -443,8 +443,8 @@ github.com/cosmos/ibc-go/v8 v8.5.1 h1:3JleEMKBjRKa3FeTKt4fjg22za/qygLBo7mDkoYTNB github.com/cosmos/ibc-go/v8 v8.5.1/go.mod h1:P5hkAvq0Qbg0h18uLxDVA9q1kOJ0l36htMsskiNwXbo= github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU= github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0= -github.com/cosmos/interchain-security/v6 v6.0.0 h1:BieZEefykqrD2Vvt3onsYjEAa5O+aWoRWSF8nN5aidE= -github.com/cosmos/interchain-security/v6 v6.0.0/go.mod h1:+5zIZEzkL4yNHB/UWXCu75t6GeEgEmWHbz5OnBWiL0o= +github.com/cosmos/interchain-security/v6 v6.1.0 h1:ycTpT+If90nSEvRVu86ThPJxNtcmnOMjJmFC9ptd/yo= +github.com/cosmos/interchain-security/v6 v6.1.0/go.mod h1:+5zIZEzkL4yNHB/UWXCu75t6GeEgEmWHbz5OnBWiL0o= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= github.com/cosmos/ledger-cosmos-go v0.13.3 h1:7ehuBGuyIytsXbd4MP43mLeoN2LTOEnk5nvue4rK+yM= @@ -1965,8 +1965,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= -google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= +google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=