From 3c97cd2cffd72e3ee8d7ac039013dd383a7f7055 Mon Sep 17 00:00:00 2001
From: Unity Chaos <86889904+UnityChaos@users.noreply.github.com>
Date: Thu, 16 Dec 2021 16:07:27 -0800
Subject: [PATCH] Add real height gates to IBC bug fix

Height 2464000, targets Monday December 20th at 4:20pm UTC.
Add height gate for v5 upgrade block, to allow v6 based testnets to create IBC channels from genesis.
---
 modules/core/02-client/keeper/keeper.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/02-client/keeper/keeper.go b/modules/core/02-client/keeper/keeper.go
index 5fe7a23e137..e10b904127d 100644
--- a/modules/core/02-client/keeper/keeper.go
+++ b/modules/core/02-client/keeper/keeper.go
@@ -309,7 +309,7 @@ func (k Keeper) ValidateSelfClient(ctx sdk.Context, clientState exported.ClientS
 
 	// Osmosis v6 patch. If height > 300, do correct logic on fixed app.go
 	// Prior to fork height, we panic with the same error we were getting before.
-	if ctx.BlockHeight() > 300 {
+	if ctx.BlockHeight() > 2464000 || ctx.BlockHeight() < 2383300 {
 		expectedUbdPeriod := k.stakingKeeper.UnbondingTime(ctx)
 		if expectedUbdPeriod != tmClient.UnbondingPeriod {
 			return sdkerrors.Wrapf(types.ErrInvalidClient, "invalid unbonding period. expected: %s, got: %s",