From 12f50f5b12bd70f107bfcfeeaadb3d1b0c5a92b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Colin=20Axn=C3=A9r?=
 <25233464+colin-axner@users.noreply.github.com>
Date: Wed, 9 Mar 2022 11:51:18 +0100
Subject: [PATCH] use upgraded client to emit height in events

---
 modules/core/02-client/keeper/client.go | 10 +++++-----
 modules/core/02-client/keeper/events.go |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/core/02-client/keeper/client.go b/modules/core/02-client/keeper/client.go
index 9bbd41ca429..26a6216b76b 100644
--- a/modules/core/02-client/keeper/client.go
+++ b/modules/core/02-client/keeper/client.go
@@ -158,13 +158,13 @@ func (k Keeper) UpgradeClient(ctx sdk.Context, clientID string, upgradedClient e
 		return sdkerrors.Wrapf(types.ErrClientNotActive, "cannot upgrade client (%s) with status %s", clientID, status)
 	}
 
-	err := clientState.VerifyUpgradeAndUpdateState(ctx, k.cdc, clientStore,
-		upgradedClient, upgradedConsState, proofUpgradeClient, proofUpgradeConsState)
-	if err != nil {
+	if err := clientState.VerifyUpgradeAndUpdateState(ctx, k.cdc, clientStore,
+		upgradedClient, upgradedConsState, proofUpgradeClient, proofUpgradeConsState,
+	); err != nil {
 		return sdkerrors.Wrapf(err, "cannot upgrade client with ID %s", clientID)
 	}
 
-	k.Logger(ctx).Info("client state upgraded", "client-id", clientID)
+	k.Logger(ctx).Info("client state upgraded", "client-id", clientID, "height", upgradedClient.GetLatestHeight().String())
 
 	defer func() {
 		telemetry.IncrCounterWithLabels(
@@ -177,7 +177,7 @@ func (k Keeper) UpgradeClient(ctx sdk.Context, clientID string, upgradedClient e
 		)
 	}()
 
-	EmitUpgradeClientEvent(ctx, clientID, upgradedClient.ClientType())
+	EmitUpgradeClientEvent(ctx, clientID, upgradedClient)
 
 	return nil
 }
diff --git a/modules/core/02-client/keeper/events.go b/modules/core/02-client/keeper/events.go
index e71faf5f821..ff8ae1c3acd 100644
--- a/modules/core/02-client/keeper/events.go
+++ b/modules/core/02-client/keeper/events.go
@@ -41,12 +41,13 @@ func EmitUpdateClientEvent(ctx sdk.Context, clientID string, clientState exporte
 }
 
 // EmitUpdateClientEvent emits an upgrade client event
-func EmitUpgradeClientEvent(ctx sdk.Context, clientID string, clientType string) {
+func EmitUpgradeClientEvent(ctx sdk.Context, clientID string, clientState exported.ClientState) {
 	ctx.EventManager().EmitEvents(sdk.Events{
 		sdk.NewEvent(
 			types.EventTypeUpgradeClient,
 			sdk.NewAttribute(types.AttributeKeyClientID, clientID),
-			sdk.NewAttribute(types.AttributeKeyClientType, clientType),
+			sdk.NewAttribute(types.AttributeKeyClientType, clientState.ClientType()),
+			sdk.NewAttribute(types.AttributeKeyConsensusHeight, clientState.GetLatestHeight().String()),
 		),
 		sdk.NewEvent(
 			sdk.EventTypeMessage,