AMENDED & RESTATED WARRANT AGREEMENT