fix: clean upgrade plan after all plans are executed

x/upgrade/abci.go

@@ -31,6 +31,7 @@ func BeginBlocker(k keeper.Keeper, ctx sdk.Context, _ abci.RequestBeginBlock) {
 	logger := ctx.Logger()
 
 	// To make sure clear upgrade is executed at the same block
+	executed := false
 	for _, plan := range plans {
 		if plan.ShouldExecute(ctx) {
 			// If skip upgrade has been set for current height, we clear the upgrade plan
@@ -47,9 +48,13 @@ func BeginBlocker(k keeper.Keeper, ctx sdk.Context, _ abci.RequestBeginBlock) {
 			ctx.Logger().Info(fmt.Sprintf("applying upgrade \"%s\" at %s", plan.Name, plan.DueAt()))
 			ctx = ctx.WithBlockGasMeter(sdk.NewInfiniteGasMeter())
 			k.ApplyUpgrade(ctx, *plan)
-			return
+			executed = true
 		}
 	}
+	if executed {
+		k.ClearIBCState(ctx, ctx.BlockHeight())
+		k.ClearUpgradePlan(ctx)
+	}
 }
 
 // BuildUpgradeNeededMsg prints the message that notifies that an upgrade is needed.

x/upgrade/keeper/keeper.go

@@ -328,8 +328,6 @@ func (k Keeper) ApplyUpgrade(ctx sdk.Context, plan types.Plan) {
 
 	// Must clear IBC state after upgrade is applied as it is stored separately from the upgrade plan.
 	// This will prevent resubmission of upgrade msg after upgrade is already completed.
-	k.ClearIBCState(ctx, plan.Height)
-	k.ClearUpgradePlan(ctx)
 	k.setDone(ctx, plan.Name)
 }