Carlos Sainz has agreed a new deal with Ferrari which will keep him at Maranello until the end of 2024.