updating wallet utils with latest srcs/classes