Remove IBC logic from x/upgrade

x/ibc/core/02-client/abci.go

@@ -11,21 +11,27 @@ import (
 func BeginBlocker(ctx sdk.Context, k keeper.Keeper) {
 	plan, found := k.GetUpgradePlan(ctx)
 	if found {
-		// Once we are at the last block this chain will commit, set the upgraded consensus state
-		// so that IBC clients can use the last NextValidatorsHash as a trusted kernel for verifying
-		// headers on the next version of the chain.
-		// Set the time to the last block time of the current chain.
-		// In order for a client to upgrade successfully, the first block of the new chain must be committed
-		// within the trusting period of the last block time on this chain.
-		_, exists := k.GetUpgradedClient(ctx, plan.Height)
-		if exists && ctx.BlockHeight() == plan.Height-1 {
-			upgradedConsState := &ibctmtypes.ConsensusState{
-				Timestamp:          ctx.BlockTime(),
-				NextValidatorsHash: ctx.BlockHeader().NextValidatorsHash,
-			}
-			bz := k.MustMarshalConsensusState(upgradedConsState)
+		planHeight, found := k.GetUpgradePlanHeight(ctx)
+		if found {
+			// Once we are at the last block this chain will commit, set the upgraded consensus state
+			// so that IBC clients can use the last NextValidatorsHash as a trusted kernel for verifying
+			// headers on the next version of the chain.
+			// Set the time to the last block time of the current chain.
+			// In order for a client to upgrade successfully, the first block of the new chain must be committed
+			// within the trusting period of the last block time on this chain.
+			//
+			// The upgrade plan must exist in x/upgrade, the plan must be an IBC upgrade, and the current height
+			// must be one before the scheduled IBC upgrade.
+			_, exists := k.GetUpgradedClient(ctx, int64(planHeight))
+			if exists && ctx.BlockHeight() == int64(planHeight)-1 && ctx.BlockHeight() == plan.Height-1 {
+				upgradedConsState := &ibctmtypes.ConsensusState{
+					Timestamp:          ctx.BlockTime(),
+					NextValidatorsHash: ctx.BlockHeader().NextValidatorsHash,
+				}
+				bz := k.MustMarshalConsensusState(upgradedConsState)
 
-			k.SetUpgradedConsensusState(ctx, plan.Height, bz)
+				k.SetUpgradedConsensusState(ctx, plan.Height, bz)
+			}
 		}
 	}
 

x/ibc/core/02-client/abci_test.go

@@ -72,6 +72,7 @@ func (suite *ClientTestSuite) TestBeginBlockerConsensusState() {
 	store := suite.chainA.GetContext().KVStore(suite.chainA.App.GetKey(upgradetypes.StoreKey))
 	bz := suite.chainA.App.AppCodec().MustMarshalBinaryBare(plan)
 	store.Set(upgradetypes.PlanKey(), bz)
+	suite.chainA.App.IBCKeeper.ClientKeeper.SetUpgradePlanHeight(suite.chainA.GetContext(), uint64(plan.Height))
 
 	nextValsHash := []byte("nextValsHash")
 	newCtx := suite.chainA.GetContext().WithBlockHeader(tmproto.Header{

x/ibc/core/02-client/types/proposal.go

@@ -111,14 +111,14 @@ func (up *UpgradeProposal) ValidateBasic() error {
 		return err
 	}
 
-	if up.Plan.Height <= 0 {
-		return sdkerrors.Wrap(ErrInvalidUpgradeProposal, "IBC chain upgrades must set a positive height")
-	}
-
 	if up.Plan.Time.Unix() > 0 {
 		return sdkerrors.Wrap(ErrInvalidUpgradeProposal, "IBC chain upgrades must only set height")
 	}
 
+	if up.Plan.Height <= 0 {
+		return sdkerrors.Wrap(ErrInvalidUpgradeProposal, "IBC chain upgrades must set a positive height")
+	}
+
 	if up.UpgradedClientState == nil {
 		return sdkerrors.Wrap(ErrInvalidUpgradeProposal, "upgraded client state cannot be nil")
 	}

x/ibc/core/02-client/types/proposal_test.go

@@ -129,12 +129,18 @@ func (suite *TypesTestSuite) TestUpgradeProposalValidateBasic() {
 				suite.Require().NoError(err)
 			}, false,
 		},
+		{
+			"plan height is zero", func() {
+				invalidPlan := upgradetypes.Plan{Name: "ibc upgrade", Height: 0}
+				proposal, err = types.NewUpgradeProposal(ibctesting.Title, ibctesting.Description, invalidPlan, cs)
+				suite.Require().NoError(err)
+			}, false,
+		},
 		{
 			"plan time is not set to 0", func() {
 				invalidPlan := upgradetypes.Plan{Name: "ibc upgrade", Time: time.Now()}
 				proposal, err = types.NewUpgradeProposal(ibctesting.Title, ibctesting.Description, invalidPlan, cs)
 				suite.Require().NoError(err)
-
 			}, false,
 		},
 		{