J1 home residency, which country?


My nationality is A. I have a passport from country A.
But I live in country B where I am a resident. I got my J1 visa in country B.

Unfortunately, my J1 visa has a 2 year home residency requirement which I think is due because of my nationality A.

Would that requirement be fulfilled if I stay in country B for two years?

This situation happened to me a while ago, I lost my DV-2019 and since then I have become a citizen of country B as well.
I'm currently in the US filing for an adjustment of status.

What should I do? Does my 2 years stay in country B count? Should I file for a waiver? I'm lost, especially that I don't have my DS-2019 anymore.

Help please.