Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wallet_api: fixups to build on the branch

This commit is contained in:
moneromooo-monero 2018-07-03 11:58:54 +01:00
parent 8fb50b738f
commit e93058b41c
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/api/wallet.cpp
View File

@ -597,7 +597,8 @@ bool WalletImpl::recoverFromDevice(const std::string &path, const std::string &p
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) {
setStatusError(string(tr("failed to generate new wallet: ")) + e.what()); m_errorString = string(tr("failed to generate new wallet: ")) + e.what();
m_status = Status_Error;
return false; return false;
} }
return true; return true;

4
src/wallet/api/wallet.h
View File

@ -116,8 +116,8 @@ public:
void setRefreshFromBlockHeight(uint64_t refresh_from_block_height); void setRefreshFromBlockHeight(uint64_t refresh_from_block_height);
uint64_t getRefreshFromBlockHeight() const { return m_wallet->get_refresh_from_block_height(); }; uint64_t getRefreshFromBlockHeight() const { return m_wallet->get_refresh_from_block_height(); };
void setRecoveringFromSeed(bool recoveringFromSeed); void setRecoveringFromSeed(bool recoveringFromSeed);
void setRecoveringFromDevice(bool recoveringFromDevice) override; void setRecoveringFromDevice(bool recoveringFromDevice);
void setSubaddressLookahead(uint32_t major, uint32_t minor) override; void setSubaddressLookahead(uint32_t major, uint32_t minor);
bool watchOnly() const; bool watchOnly() const;
bool rescanSpent(); bool rescanSpent();
NetworkType nettype() const {return static_cast<NetworkType>(m_wallet->nettype());} NetworkType nettype() const {return static_cast<NetworkType>(m_wallet->nettype());}

2
src/wallet/api/wallet_manager.h
View File

@ -69,7 +69,7 @@ public:
NetworkType nettype, NetworkType nettype,
const std::string &deviceName, const std::string &deviceName,
uint64_t restoreHeight = 0, uint64_t restoreHeight = 0,
const std::string &subaddressLookahead = "") override; const std::string &subaddressLookahead = "");
virtual bool closeWallet(Wallet *wallet, bool store = true); virtual bool closeWallet(Wallet *wallet, bool store = true);
bool walletExists(const std::string &path); bool walletExists(const std::string &path);
bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key) const; bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key) const;