Skip to content

Commit

Permalink
Merge branch 'main' into marius/rewards-memo
Browse files Browse the repository at this point in the history
  • Loading branch information
sainoe committed Sep 25, 2024
2 parents 7595e28 + ccb2679 commit bcefcf7
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 4 deletions.
1 change: 1 addition & 0 deletions .changelog/v6.1.0/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*September 20, 2024*
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# CHANGELOG

## v6.1.0

*September 20, 2024*

### BUG FIXES

- Remove duplicate event emission on cached context.
([\#2282](https://github.com/cosmos/interchain-security/pull/2282))
- `[x/provider]` Add patch to enable ICS rewards from Stride to be distributed.
([\#2288](https://github.com/cosmos/interchain-security/pull/2288))

### STATE BREAKING

- `[x/provider]` Add patch to enable ICS rewards from Stride to be distributed.
([\#2288](https://github.com/cosmos/interchain-security/pull/2288))

## v6.0.0

*September 12, 2024*
Expand Down
2 changes: 1 addition & 1 deletion FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The following table indicates the major ICS features available in the [currently active releases](./RELEASES.md#version-matrix):

| Feature | `v4.0.0` | `v4.3.1` | `v4.3.1-lsm` | `v4.4.0` | `v5.0.0` | `v5.2.0` | `v6.0.0` |
| Feature | `v4.0.0` | `v4.3.1` | `v4.3.1-lsm` | `v4.4.0` | `v5.0.0` | `v5.2.0` | `v6.1.0` |
|---------|---------:|---------:|-------------:|---------:|---------:|---------:|----------:|
| [Channel initialization: new chains](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#channel-initialization-new-chains) ||||||||
| [Validator set update](https://github.com/cosmos/ibc/blob/main/spec/app/ics-028-cross-chain-validation/overview_and_basic_concepts.md#validator-set-update) ||||||||
Expand Down
6 changes: 3 additions & 3 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ All missing minor release versions have been discontinued.
| `v4.4.x` | January 24, 2025 |
| `v5.0.x` | May 9, 2025 |
| `v5.2.x` | May 9, 2025 |
| `v6.0.x` | Sep 13, 2025 |
| `v6.1.x` | Sep 13, 2025 |

**Note**: Gaia versions on SDK 0.47 (i.e., `v15.0.x` -- `v18.1.x`) use a fork of Cosmos SDK (i.e., `v0.47.x-ics-lsm`) that contains the Liquid Staking Module (LSM).
This means that these versions of Gaia require a fork of ICS.
Expand All @@ -82,7 +82,7 @@ Versions of Golang, IBC, Cosmos SDK and CometBFT used by ICS in the currently ac
| [v4.4.0](https://github.com/cosmos/interchain-security/releases/tag/v4.4.0) | 1.21 | v7.6.0 | v0.47.12 | v0.37.6 | |
| [v5.0.0](https://github.com/cosmos/interchain-security/releases/tag/v5.0.0) | 1.21 | v8.1.0 | v0.50.4 | v0.38.5 | |
| [v5.2.0](https://github.com/cosmos/interchain-security/releases/tag/v5.2.0) | 1.22 | v8.3.2 | v0.50.8 | v0.38.9 | |
| [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0) | 1.22 | v8.5.0 | v0.50.9 | v0.38.11 | |
| [v6.1.0](https://github.com/cosmos/interchain-security/releases/tag/v6.1.0) | 1.22 | v8.5.0 | v0.50.9 | v0.38.11 | |

**Note:** For a list of major ICS features available in the currently active releases, see [FEATURES.md](./FEATURES.md).

Expand All @@ -92,7 +92,7 @@ A MAJOR version of ICS will always be backwards compatible with the previous MAJ

The following table indicates the compatibility of currently active releases:

| Consumer | Provider | `v4.3.1-lsm` | `v5.2.0` | `v6.0.0` |
| Consumer | Provider | `v4.3.1-lsm` | `v5.2.0` | `v6.1.0` |
| -------- | -------- | ------------ | -------- | -------- |
| `v4.0.0` | ||||
| `v4.3.1` | ||||
Expand Down

0 comments on commit bcefcf7

Please sign in to comment.