Formula One has confirmed Monaco will stay on the calendar until 2025 and that Las Vegas will next year host the first Saturday grand prix since 1985.