Merge pull request #1380

657a70e0 wallet: add a getter for the filename path (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-12-04 22:02:40 +02:00
commit 3d533d1037
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
5 changed files with 14 additions and 0 deletions

View file

@ -399,6 +399,11 @@ std::string WalletImpl::integratedAddress(const std::string &payment_id) const
return m_wallet->get_account().get_public_integrated_address_str(pid, m_wallet->testnet());
}
std::string WalletImpl::path() const
{
return m_wallet->path();
}
bool WalletImpl::store(const std::string &path)
{
clearStatus();

View file

@ -64,6 +64,7 @@ public:
bool setPassword(const std::string &password);
std::string address() const;
std::string integratedAddress(const std::string &payment_id) const;
std::string path() const;
bool store(const std::string &path);
std::string filename() const;
std::string keysFilename() const;

View file

@ -2353,6 +2353,11 @@ void wallet2::check_genesis(const crypto::hash& genesis_hash) const {
THROW_WALLET_EXCEPTION_IF(genesis_hash != m_blockchain[0], error::wallet_internal_error, what);
}
//----------------------------------------------------------------------------------------------------
std::string wallet2::path() const
{
return m_wallet_file;
}
//----------------------------------------------------------------------------------------------------
void wallet2::store()
{
store_to("", "");

View file

@ -332,6 +332,8 @@ namespace tools
*/
void store_to(const std::string &path, const std::string &password);
std::string path() const;
/*!
* \brief verifies given password is correct for default wallet keys file
*/

View file

@ -195,6 +195,7 @@ struct Wallet
virtual std::string errorString() const = 0;
virtual bool setPassword(const std::string &password) = 0;
virtual std::string address() const = 0;
virtual std::string path() const = 0;
/*!
* \brief integratedAddress - returns integrated address for current wallet address and given payment_id.