A deal to the end the U.S.-Iran war could be finalized within 24 hours. Tehran wants to charge ships crossing Hormuz ‘for services rendered’