From 1fadb9697043ececa0fdcd1d8794f53b333d60b1 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Mon, 14 Aug 2023 10:09:21 -0700
Subject: [PATCH 1/2] smalls

---
 UPGRADING.md             | 10 ++--------
 x/ccv/consumer/module.go |  7 +------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/UPGRADING.md b/UPGRADING.md
index 588a135bdb..a8c1d333dc 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -62,12 +62,6 @@ import (
 )
 ```
 
-## [v2.0.x](https://github.com/cosmos/interchain-security/releases/tag/v2.0.0)
+## [v4.0.x](https://github.com/cosmos/interchain-security/tree/release%2Fv4.0.x)
 
-### Provider 
-
-Upgrading a provider from `v1.1.0-multiden` to `v2.0.0` will require state migrations. See [migration.go](./x/ccv/provider/keeper/migration.go). See the provider module's `ConsensusVersion` in [module](./x/ccv/provider/module.go).
-
-### Consumer
-
-Upgrading a consumer from `v1.2.0-multiden` to `v2.0.0` will NOT require state migrations. See the consumer module's `ConsensusVersion` in [module](./x/ccv/consumer/module.go).
\ No newline at end of file
+Upgrading a consumer from a previous version of ICS to v4.0.0 will require state migrations. See [migration.go](./x/ccv/consumer/keeper/migration.go) See the consumer module's `ConsensusVersion` in [module](./x/ccv/consumer/module.go).
diff --git a/x/ccv/consumer/module.go b/x/ccv/consumer/module.go
index fe9b18a945..ca3e5e3e8c 100644
--- a/x/ccv/consumer/module.go
+++ b/x/ccv/consumer/module.go
@@ -125,12 +125,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 
 // ConsensusVersion implements AppModule/ConsensusVersion.
 func (AppModule) ConsensusVersion() uint64 {
-	// Note that v1.0.0 consumers should technically be on a different consensus version
-	// than v1.2.0-multiden and v2.0.0. However, Neutron was the first consumer to launch
-	// in prod, and they've started on v1.2.0-multiden (which has a ConsensusVersion of 1).
-	//
-	// v1.2.0-multiden and v2.0.0 are consensus compatible, so they need return the same ConsensusVersion of 1.
-	return 1
+	return 2
 }
 
 // BeginBlock implements the AppModule interface

From cf90150f3c3ebbcc921da1983e20390ea50533b7 Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Mon, 14 Aug 2023 10:20:17 -0700
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c019b885c..691c67999d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 Add an entry to the unreleased section whenever merging a PR to main that is not targeted at a specific release. These entries will eventually be included in a release.
 
+## v4.0.0
+
+Date August 14th, 2023
+
+A standard release of ICS which includes a bump to IBC 7.2.0, and consumer changes related to pending packet storage. Note deployment of this release will require a state migration for consumers! See [upgrading](./upgrading.md) for more details.
+
+* (fix) add upgrade note and increment consumer consensus version [#1201](https://github.com/cosmos/interchain-security/pull/1201)
 * (deps!) [#1196](https://github.com/cosmos/interchain-security/pull/1196) Bump [ibc-go](https://github.com/cosmos/ibc-go) to [v7.2.0](https://github.com/cosmos/ibc-go/releases/tag/v7.2.0).
 * `[x/ccv/provider]` (fix) [#1076](https://github.com/cosmos/interchain-security/pull/1076) Add `InitTimeoutTimestamps` and `ExportedVscSendTimestamps` to exported genesis.
 * (feat!) [#1024](https://github.com/cosmos/interchain-security/pull/1024) throttle with retries, consumer changes