I don’t know how that can be solved if each wallet has a static public key that can’t be abstracted away by design.