monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 04:29:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

use default create_address_file argument

Browse source
This commit is contained in:
m2049r 2018-09-27 17:52:52 +02:00
parent 8bf5a00564
commit 921b0fb11b
No known key found for this signature in database
GPG key ID: 4386E69AF260078D
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/api/wallet.cpp
View file

@ -609,7 +609,7 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path,
LOG_PRINT_L1("Generated new view only wallet from keys"); LOG_PRINT_L1("Generated new view only wallet from keys");
} }
if(has_spendkey && !has_viewkey) { if(has_spendkey && !has_viewkey) {
m_wallet->generate(path, password, spendkey, true, false, false); m_wallet->generate(path, password, spendkey, true, false);
setSeedLanguage(language); setSeedLanguage(language);
LOG_PRINT_L1("Generated deterministic wallet from spend key with seed language: " + language); LOG_PRINT_L1("Generated deterministic wallet from spend key with seed language: " + language);
} }
@ -629,7 +629,7 @@ bool WalletImpl::recoverFromDevice(const std::string &path, const std::string &p
m_recoveringFromDevice = true; m_recoveringFromDevice = true;
try try
{ {
m_wallet->restore(path, password, device_name, false); m_wallet->restore(path, password, device_name);
LOG_PRINT_L1("Generated new wallet from device: " + device_name); LOG_PRINT_L1("Generated new wallet from device: " + device_name);
} }
catch (const std::exception& e) { catch (const std::exception& e) {

2
src/wallet/wallet2.h
View file

@ -554,7 +554,7 @@ namespace tools
* \param device_name name of HW to use * \param device_name name of HW to use
* \param create_address_file Whether to create an address file * \param create_address_file Whether to create an address file
*/ */
void restore(const std::string& wallet_, const epee::wipeable_string& password, const std::string &device_name, bool create_address_file); void restore(const std::string& wallet_, const epee::wipeable_string& password, const std::string &device_name, bool create_address_file = false);
/*! /*!
* \brief Creates a multisig wallet * \brief Creates a multisig wallet