AMENDED AND RESTATED WARRANT INDENTURE