go/consensus/tendermint/apps/roothash: Clear timeout in emitEmptyBlock

.changelog/3213.trivial.md

@@ -0,0 +1 @@
+go/consensus/tendermint/apps/roothash: Clear timeout in emitEmptyBlock

go/consensus/tendermint/apps/roothash/roothash.go

@@ -236,6 +236,13 @@ func (app *rootHashApplication) emitEmptyBlock(ctx *tmapi.Context, runtime *root
 	runtime.CurrentBlock = blk
 	runtime.CurrentBlockHeight = ctx.BlockHeight()
 	if runtime.ExecutorPool != nil {
+		// Clear timeout if there was one scheduled.
+		if runtime.ExecutorPool.NextTimeout != commitment.TimeoutNever {
+			state := roothashState.NewMutableState(ctx.State())
+			if err := state.ClearRoundTimeout(ctx, runtime.Runtime.ID, runtime.ExecutorPool.NextTimeout); err != nil {
+				panic(fmt.Errorf("failed to clear round timeout: %w", err))
+			}
+		}
 		runtime.ExecutorPool.ResetCommitments()
 	}