diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-29 22:16:40 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-29 22:20:35 +0200 |
| commit | 9a54d0033e1104a264ddf05cc7e00bbbac12fba5 (patch) | |
| tree | 79feefe2c9505febac45f3c617da287bff1c2b63 | |
| parent | Merge pull request #4457 (diff) | |
| download | monero-9a54d0033e1104a264ddf05cc7e00bbbac12fba5.tar.xz | |
Merge pull request #4458
921b0fb1 use default create_address_file argument (m2049r)
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/api/wallet.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 96e5c8629..3d4e981ea 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -603,7 +603,7 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path, LOG_PRINT_L1("Generated new view only wallet from keys"); } if(has_spendkey && !has_viewkey) { - m_wallet->generate(path, password, spendkey, true, false, false); + m_wallet->generate(path, password, spendkey, true, false); setSeedLanguage(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; 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); } catch (const std::exception& e) { diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index acbc09c36..db1ac7e42 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -554,7 +554,7 @@ namespace tools * \param device_name name of HW to use * \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 |