F1 has agreed a new six-year deal with the Monaco Grand Prix, keeping the famous race on the calendar until 2031 inclusive.