mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #2270
1307e3cc
WalletAPI: add getDefaultDataDir() (Jaquee)
This commit is contained in:
commit
b6fc7f283f
3 changed files with 10 additions and 0 deletions
|
@ -35,6 +35,7 @@
|
||||||
#include "transaction_history.h"
|
#include "transaction_history.h"
|
||||||
#include "address_book.h"
|
#include "address_book.h"
|
||||||
#include "common_defines.h"
|
#include "common_defines.h"
|
||||||
|
#include "common/util.h"
|
||||||
|
|
||||||
#include "mnemonics/electrum-words.h"
|
#include "mnemonics/electrum-words.h"
|
||||||
#include <boost/format.hpp>
|
#include <boost/format.hpp>
|
||||||
|
@ -1411,6 +1412,11 @@ bool WalletImpl::parse_uri(const std::string &uri, std::string &address, std::st
|
||||||
return m_wallet->parse_uri(uri, address, payment_id, amount, tx_description, recipient_name, unknown_parameters, error);
|
return m_wallet->parse_uri(uri, address, payment_id, amount, tx_description, recipient_name, unknown_parameters, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string WalletImpl::getDefaultDataDir() const
|
||||||
|
{
|
||||||
|
return tools::get_default_data_dir();
|
||||||
|
}
|
||||||
|
|
||||||
bool WalletImpl::rescanSpent()
|
bool WalletImpl::rescanSpent()
|
||||||
{
|
{
|
||||||
clearStatus();
|
clearStatus();
|
||||||
|
|
|
@ -129,6 +129,7 @@ public:
|
||||||
virtual void startRefresh();
|
virtual void startRefresh();
|
||||||
virtual void pauseRefresh();
|
virtual void pauseRefresh();
|
||||||
virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error);
|
virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error);
|
||||||
|
virtual std::string getDefaultDataDir() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void clearStatus() const;
|
void clearStatus() const;
|
||||||
|
|
|
@ -596,6 +596,9 @@ struct Wallet
|
||||||
virtual bool verifySignedMessage(const std::string &message, const std::string &addres, const std::string &signature) const = 0;
|
virtual bool verifySignedMessage(const std::string &message, const std::string &addres, const std::string &signature) const = 0;
|
||||||
|
|
||||||
virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) = 0;
|
virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) = 0;
|
||||||
|
|
||||||
|
virtual std::string getDefaultDataDir() const = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* \brief rescanSpent - Rescan spent outputs - Can only be used with trusted daemon
|
* \brief rescanSpent - Rescan spent outputs - Can only be used with trusted daemon
|
||||||
* \return true on success
|
* \return true on success
|
||||||
|
|
Loading…
Reference in a new issue