SRAM XO Rear Mech less than a year old….

Noticed one of the pivot pins half out the other day and the retaining circlip had gone AWOL, managed to find a E clip to make a temporary repair but this and another circlip have also gone AWOL over the weekend, so now I have 2 pivot pins not secured. Can't say i'm very pleased as i'm thinking next time I might not spot it in time and end up with a trashed mech.

The circlips are stupidly small so getting replacements is proving to be a challenge, so I was wondering if anyone knows what size/type they are and a potential supplier?