Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-23 16:35:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/mbg033/bitmonero

Browse source
This commit is contained in:
Ilya Kitaev 2016-06-23 16:23:09 +03:00
commit ab61ba0c9b
5 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/wallet/wallet2.cpp
View file

@ -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 &note)
{
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)