Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4458 

921b0fb1 use default create_address_file argument (m2049r)
This commit is contained in:
Riccardo Spagni 2018-09-29 22:16:40 +02:00
parent 4e3bff92ab
commit 9a54d0033e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
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

@ -603,7 +603,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);
} }
@ -623,7 +623,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