diff options
| author | Ilya Kitaev <mbg033@gmail.com> | 2016-06-23 16:23:09 +0300 |
|---|---|---|
| committer | Ilya Kitaev <mbg033@gmail.com> | 2016-06-23 16:23:09 +0300 |
| commit | ab61ba0c9b9e39fb73a11e4d38dc5c37e453e6c7 (patch) | |
| tree | a9bf9b3b2b00bb3bf9e0bd467cc55db24255d724 /src/wallet/wallet2.cpp | |
| parent | WalletManager::findWallets: searching by "keys" files instead of (diff) | |
| parent | PendingTransactionImpl: pointer->reference (diff) | |
| download | monero-ab61ba0c9b9e39fb73a11e4d38dc5c37e453e6c7.tar.xz | |
Merge branch 'master' of https://github.com/mbg033/bitmonero
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 4586c3530..02dd59862 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3064,6 +3064,11 @@ std::string wallet2::get_keys_file() const return m_keys_file; } +std::string wallet2::get_daemon_address() const +{ + return m_daemon_address; +} + void wallet2::set_tx_note(const crypto::hash &txid, const std::string ¬e) { m_tx_notes[txid] = note; @@ -3076,12 +3081,6 @@ std::string wallet2::get_tx_note(const crypto::hash &txid) const return std::string(); return i->second; } - -std::string wallet2::get_daemon_address() const -{ - return m_daemon_address; -} - //---------------------------------------------------------------------------------------------------- void wallet2::generate_genesis(cryptonote::block& b) { if (m_testnet) |