Waffenamt looks like WaAU38, and appears to be the same as the other WaA example posted above.

Also of interest, the method/tooling used to press the rivet and the boxed Mod.98 looks identical to...