Resolve conflicts & merge branch 'main' into feat/refactor-key-assign…

…ment

.changelog/epilogue.md

@@ -23,6 +23,28 @@ Interchain Security v3 uses SDK 0.47 and IBC 7.
 * `[x/ccv/provider]` (fix) [#977](https://github.com/cosmos/interchain-security/pull/977) Avoids panicking the provider when an unbonding delegation was removed through a `CancelUnbondingDelegation` message.
 * `[x/ccv/democracy]` (feat) [#1019](https://github.com/cosmos/interchain-security/pull/1019) Whitelisting non-legacy params in the "democracy module" require the entire module to be whitelisted. 
 
+## v2.4.0-lsm
+
+*November 20, 2023*
+
+* (fix) [#1439](https://github.com/cosmos/interchain-security/pull/1439) Fix unmarshaling for the CLI consumer double vote cmd.
+* (feat!) [#1435](https://github.com/cosmos/interchain-security/pull/1435) Add height-base filter for consumer equivocation evidence.
+
+## v2.3.0-provider-lsm
+
+*November 15, 2023*
+
+❗ *This release is deprecated and should not be used in production.*
+
+* (fix!) [#1422](https://github.com/cosmos/interchain-security/pull/1422) Fix the misbehaviour handling by verifying the signatures of byzantine validators.
+
+## v2.2.0-provider-lsm
+
+❗ *This release is deprecated and should not be used in production.*
+
+### Cryptographic verification of equivocation
+* New feature enabling the provider chain to verify equivocation evidence on its own instead of trusting consumer chains, see [EPIC](https://github.com/cosmos/interchain-security/issues/732).
+
 ## v2.1.0-provider-lsm
 
 Date: September 15th, 2023

.changelog/unreleased/api-breaking/provider/1340-add-cryptographic-verification-of-equivocation-feature.md

@@ -0,0 +1,2 @@
+- Deprecate equivocation proposals.  
+([\#1340](https://github.com/cosmos/interchain-security/pull/1340))

.changelog/unreleased/features/provider/1340-cryptographic-equivocation-feature.md

@@ -0,0 +1,4 @@
+- Introduce the cryptographic verification of equivocation feature to the provider
+  (cf. [ADR-005](/docs/docs/adrs/adr-005-cryptographic-equivocation-verification.md)
+  & [ADR-013](/docs/docs/adrs/adr-013-equivocation-slashing.md)).  
+  ([\#1340](https://github.com/cosmos/interchain-security/pull/1340))

.changelog/unreleased/state-breaking/provider/1340-cryptographic-equivocation-feature.md

@@ -0,0 +1,4 @@
+- Introduce the cryptographic verification of equivocation feature to the provider
+  (cf. [ADR-005](/docs/docs/adrs/adr-005-cryptographic-equivocation-verification.md)
+  & [ADR-013](/docs/docs/adrs/adr-013-equivocation-slashing.md)).  
+  ([\#1340](https://github.com/cosmos/interchain-security/pull/1340))

.github/workflows/gosec.yml

@@ -9,7 +9,7 @@ on:
       - main
       - feat/*
 jobs:
-  tests:
+  Gosec:
     runs-on: ubuntu-latest
     env:
       GO111MODULE: on

.github/workflows/proto-registry.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/[email protected].0
+      - uses: bufbuild/[email protected].1
       - uses: bufbuild/buf-push-action@v1
         with:
           input: "proto"

.github/workflows/proto.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/[email protected].0
+      - uses: bufbuild/[email protected].1
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"