aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.h
diff options
context:
space:
mode:
authorIlya Kitaev <mbg033@gmail.com>2016-06-23 16:23:09 +0300
committerIlya Kitaev <mbg033@gmail.com>2016-06-23 16:23:09 +0300
commitab61ba0c9b9e39fb73a11e4d38dc5c37e453e6c7 (patch)
treea9bf9b3b2b00bb3bf9e0bd467cc55db24255d724 /src/wallet/wallet2.h
parentWalletManager::findWallets: searching by "keys" files instead of (diff)
parentPendingTransactionImpl: pointer->reference (diff)
downloadmonero-ab61ba0c9b9e39fb73a11e4d38dc5c37e453e6c7.tar.xz
Merge branch 'master' of https://github.com/mbg033/bitmonero
Diffstat (limited to '')
-rw-r--r--src/wallet/wallet2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 6e49b8dac..85bf33e3f 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -374,6 +374,7 @@ namespace tools
std::string get_wallet_file() const;
std::string get_keys_file() const;
+ std::string get_daemon_address() const;
std::vector<size_t> select_available_outputs_from_histogram(uint64_t count, bool atleast, bool trusted_daemon);
std::vector<size_t> select_available_outputs(const std::function<bool(const transfer_details &td)> &f);
@@ -383,7 +384,6 @@ namespace tools
void set_tx_note(const crypto::hash &txid, const std::string &note);
std::string get_tx_note(const crypto::hash &txid) const;
- std::string get_daemon_address() const;
private:
/*!
* \brief Stores wallet information to wallet file.