aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorm2049r <m2049r@monerujo.io>2018-09-27 17:52:52 +0200
committerm2049r <m2049r@monerujo.io>2018-09-27 17:59:46 +0200
commit921b0fb11ba19eaa06e4a716221f0e04fa50bed1 (patch)
treeebe32d33c0e188f6121989929d73be4f2d889185
parentMerge pull request #4423 (diff)
downloadmonero-921b0fb11ba19eaa06e4a716221f0e04fa50bed1.tar.xz
use default create_address_file argument
-rw-r--r--src/wallet/api/wallet.cpp4
-rw-r--r--src/wallet/wallet2.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 5827e4d1a..ae3073124 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -609,7 +609,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);
}
@@ -629,7 +629,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