Salehi made his most recent remarks following meetings with Director of the International Atomic Energy Agency (IAEA), Yukiya Amano, in Tehran.
Iranian President Hassan Rouhani ordered in December 2016 the development of a nuclear-propulsion system for vessels in response to US sanctions against Iran.
Baqeri stressed that the JCPOA was a compromise between Iran and several countries and had been approved by the United Nations Security Council, so Tehran's withdrawal from the pact would be final in case of a reversal of sanctions.
"I requested that Iran ... fully implement the nuclear-related commitments".
The US has asked the IAEA to carry out further inspections in Iran, specifically in its military installations, under the JCPOA nuclear deal.
The accord between its five permanent members (China, France, Russia, the United Kingdom and the United States), plus Germany, the European Union (EU) and Iran, set out rigorous mechanisms for monitoring limits on Iran's nuclear programme, while paving the way for lifting UN sanctions against the country.
Trump had repeatedly lambasted the agreement as the "stupidest" and "one of the worst and most one-sided transactions the United States has ever entered into".
"You object to our weapons, we are going to manufacture and store any kind of weapons we need", Rouhani said. And we will not hesitate to use them in the appropriate time to defend ourselves. Stories like this are made possible by readers like you.