Feature/wallet config

Feature/wallet config