kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2270

Browse source 
1307e3cc WalletAPI: add getDefaultDataDir() (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-08-15 20:51:11 +02:00
commit b6fc7f283f
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wallet/api/wallet.cpp
View file

@ -35,6 +35,7 @@
#include "transaction_history.h"
#include "address_book.h"
#include "common_defines.h"
#include "common/util.h"
#include "mnemonics/electrum-words.h"
#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);
}
std::string WalletImpl::getDefaultDataDir() const
{
return tools::get_default_data_dir();
}
bool WalletImpl::rescanSpent()
{
clearStatus();

1
src/wallet/api/wallet.h
View file

@ -129,6 +129,7 @@ public:
virtual void startRefresh();
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 std::string getDefaultDataDir() const;
private:
void clearStatus() const;

3
src/wallet/wallet2_api.h
View file

@ -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 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
* \return true on success