Resolved conflicts with main

.changelog/config.toml

@@ -1,21 +1,7 @@
 project_url = "https://github.com/cosmos/interchain-security"
 
-# Settings related to components/sub-modules. Only relevant if you make use of
-# components/sub-modules.
-[components]
-
-# The title to use for the section of entries not relating to a specific
-# component.
-general_entries_title = "General"
-
 # The number of spaces to inject before each component-related entry.
 entry_indent = 2
 
-    # The components themselves. Each component has a name (used when rendered
-    # to Markdown) and a path relative to the project folder (i.e. relative to
-    # the parent of the `.changelog` folder).
-    [components.all]
-    provider = { name = "Provider", path = "x/ccv/provider" }
-    consumer = { name = "Consumer", path = "x/ccv/consumer" }
-    tests = { name = "Tests", path = "tests" }
-    docs = { name = "Documentation", path = "docs/docs" }
+[change_set_sections]
+sort_entries_by = "entry-text"

.changelog/unreleased/dependencies/2277-bump-ibc.md

@@ -0,0 +1,3 @@
+- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+  [v8.5.1](https://github.com/cosmos/ibc-go/releases/tag/v8.5.1).
+  ([\#2277](https://github.com/cosmos/interchain-security/pull/2277))

.changelog/unreleased/features/2290-add-memo-to-ICS-rewards.md

@@ -0,0 +1,4 @@
+- `[x/consumer]` Populate the memo on the IBC transfer packets used to send ICS rewards.
+with the required consumer chain Id to identify the consumer to the provider.
+- `[x/provider]` Identify the source of ICS rewards from the IBC transfer packet memo.
+  ([\#2290](https://github.com/cosmos/interchain-security/pull/2290))

.changelog/unreleased/features/2309-allow-permissionless-whitelisting.md

@@ -0,0 +1,2 @@
+- `[x/provider]` Enable permissionless allowlisting of reward denoms (at most 3) per consumer chain. 
+  ([\#2309](https://github.com/cosmos/interchain-security/pull/2309))

.changelog/unreleased/state-breaking/2290-add-memo-to-ICS-rewards.md

@@ -0,0 +1,4 @@
+- `[x/consumer]` Populate the memo on the IBC transfer packets used to send ICS rewards.
+with the required consumer chain Id to identify the consumer to the provider.
+- `[x/provider]` Identify the source of ICS rewards from the IBC transfer packet memo.
+  ([\#2290](https://github.com/cosmos/interchain-security/pull/2290))

.changelog/unreleased/state-breaking/2309-allow-permissionless-whitelisting.md

@@ -0,0 +1,2 @@
+- `[x/provider]` Enable permissionless allowlisting of reward denoms (at most 3) per consumer chain.
+  ([\#2309](https://github.com/cosmos/interchain-security/pull/2309))