Incorporate API changes
 - addresses -> wallets
 - keychain API changes
 - wallet API changes