protobuf refactoring
harden wallet hierarchy