Donald Trump to end waivers, escalating Iran feud; oil prices climb