I’d double check that...
There are those, even on the right (like Michael Farris) that state that a treaty has the amendment-like authority.
I believe this is already settled law. I remember in the last few years reading it right here on FR.
I’m not worried about it in the least. Worse comes to worse, if they ever try to confiscate my firearms I already am prepared to do what is necessary.