chore: backport #1741

CHANGELOG.md

@@ -45,6 +45,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Improvements
 
 * (core/02-client) [\#1570](https://github.com/cosmos/ibc-go/pull/1570) Emitting an event when handling an upgrade client proposal.
+* (modules/core/02-client) [\#1741](https://github.com/cosmos/ibc-go/pull/1741) Emitting a new `upgrade_chain` event upon setting upgrade consensus state.
 
 ### Features
 

modules/core/02-client/abci.go

@@ -26,6 +26,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) {
 			bz := k.MustMarshalConsensusState(upgradedConsState)
 
 			k.SetUpgradedConsensusState(ctx, plan.Height, bz)
+			keeper.EmitUpgradeChainEvent(ctx, plan.Height)
 		}
 	}
 

modules/core/02-client/abci_test.go

@@ -1,13 +1,15 @@
 package client_test
 
 import (
+	"strings"
 	"testing"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	client "github.com/cosmos/ibc-go/v2/modules/core/02-client"
 	"github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
 	"github.com/cosmos/ibc-go/v2/modules/core/exported"
@@ -92,3 +94,55 @@ func (suite *ClientTestSuite) TestBeginBlockerConsensusState() {
 	suite.Require().NoError(err)
 	suite.Require().Equal(bz, consState)
 }
+
+func (suite *ClientTestSuite) TestBeginBlockerUpgradeEvents() {
+	plan := &upgradetypes.Plan{
+		Name:   "test",
+		Height: suite.chainA.GetContext().BlockHeight() + 1,
+	}
+	// set upgrade plan in the upgrade store
+	store := suite.chainA.GetContext().KVStore(suite.chainA.GetSimApp().GetKey(upgradetypes.StoreKey))
+	bz := suite.chainA.App.AppCodec().MustMarshal(plan)
+	store.Set(upgradetypes.PlanKey(), bz)
+
+	nextValsHash := []byte("nextValsHash")
+	newCtx := suite.chainA.GetContext().WithBlockHeader(tmproto.Header{
+		Height:             suite.chainA.GetContext().BlockHeight(),
+		NextValidatorsHash: nextValsHash,
+	})
+
+	err := suite.chainA.GetSimApp().UpgradeKeeper.SetUpgradedClient(newCtx, plan.Height, []byte("client state"))
+	suite.Require().NoError(err)
+
+	cacheCtx, writeCache := suite.chainA.GetContext().CacheContext()
+
+	client.BeginBlocker(cacheCtx, suite.chainA.App.GetIBCKeeper().ClientKeeper)
+	writeCache()
+
+	suite.requireContainsEvent(cacheCtx.EventManager().Events(), types.EventTypeUpgradeChain, true)
+}
+
+func (suite *ClientTestSuite) TestBeginBlockerUpgradeEventsAbsence() {
+	cacheCtx, writeCache := suite.chainA.GetContext().CacheContext()
+	client.BeginBlocker(suite.chainA.GetContext(), suite.chainA.App.GetIBCKeeper().ClientKeeper)
+	writeCache()
+	suite.requireContainsEvent(cacheCtx.EventManager().Events(), types.EventTypeUpgradeChain, false)
+}
+
+// requireContainsEvent verifies if an event of a specific type was emitted.
+func (suite *ClientTestSuite) requireContainsEvent(events sdk.Events, eventType string, shouldContain bool) {
+	found := false
+	var eventTypes []string
+	for _, e := range events {
+		eventTypes = append(eventTypes, e.Type)
+		if e.Type == eventType {
+			found = true
+			break
+		}
+	}
+	if shouldContain {
+		suite.Require().True(found, "event type %s was not found in %s", eventType, strings.Join(eventTypes, ","))
+	} else {
+		suite.Require().False(found, "event type %s was found in %s", eventType, strings.Join(eventTypes, ","))
+	}
+}

modules/core/02-client/keeper/events.go

@@ -1,9 +1,13 @@
 package keeper
 
 import (
+	"encoding/hex"
 	"fmt"
+	"strconv"
+	"strings"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
 	"github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
 )
@@ -18,3 +22,14 @@ func EmitUpgradeClientProposalEvent(ctx sdk.Context, title string, height int64)
 		),
 	)
 }
+
+// EmitUpgradeChainEvent emits an upgrade chain event.
+func EmitUpgradeChainEvent(ctx sdk.Context, height int64) {
+	ctx.EventManager().EmitEvents(sdk.Events{
+		sdk.NewEvent(
+			types.EventTypeUpgradeChain,
+			sdk.NewAttribute(types.AttributeKeyUpgradePlanHeight, strconv.FormatInt(height, 10)),
+			sdk.NewAttribute(types.AttributeKeyUpgradeStore, upgradetypes.StoreKey), // which store to query proof of consensus state from
+		),
+	})
+}

modules/core/02-client/types/events.go

@@ -15,6 +15,8 @@ const (
 	AttributeKeyHeader            = "header"
 	AttributeKeyUpgradePlanTitle  = "title"
 	AttributeKeyUpgradePlanHeight = "height"
+	AttributeKeyUpgradeStore      = "upgrade_store"
+	AttributeKeyUpgradePlanHeight = "upgrade_plan_height"
 )
 
 // IBC client events vars
@@ -25,6 +27,7 @@ var (
 	EventTypeSubmitMisbehaviour    = "client_misbehaviour"
 	EventTypeUpdateClientProposal  = "update_client_proposal"
 	EventTypeUpgradeClientProposal = "upgrade_client_proposal"
+	EventTypeUpgradeChain          = "upgrade_chain"
 
 	AttributeValueCategory = fmt.Sprintf("%s_%s", host.ModuleName, SubModuleName)
 )