diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-10-05 11:40:25 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-10-05 11:40:25 +0200 |
| commit | 434095d1f7ddfaef44e61173f56a243e6d215159 (patch) | |
| tree | 8ffe82bdadf53bc50c052b50b2ee2ee6922c02de /src/wallet | |
| parent | Merge pull request #169 (diff) | |
| parent | Uses new Japanese file. Gives credit to dabura667. English file indentation t... (diff) | |
| download | monero-434095d1f7ddfaef44e61173f56a243e6d215159.tar.xz | |
fixed conflict in CMakeLists
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 11 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6fb672798..5af9a71bd 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -46,7 +46,7 @@ using namespace epee; #include "crypto/crypto.h" #include "serialization/binary_utils.h" #include "cryptonote_protocol/blobdatatype.h" -#include "crypto/electrum-words.h" +#include "mnemonics/electrum-words.h" #include "common/dns_utils.h" extern "C" @@ -88,7 +88,7 @@ void wallet2::init(const std::string& daemon_address, uint64_t upper_transaction //---------------------------------------------------------------------------------------------------- bool wallet2::get_seed(std::string& electrum_words) { - crypto::ElectrumWords::bytes_to_words(get_account().get_keys().m_spend_secret_key, electrum_words); + crypto::ElectrumWords::bytes_to_words(get_account().get_keys().m_spend_secret_key, electrum_words, seed_language); crypto::secret_key second; keccak((uint8_t *)&get_account().get_keys().m_spend_secret_key, sizeof(crypto::secret_key), (uint8_t *)&second, sizeof(crypto::secret_key)); @@ -97,6 +97,13 @@ bool wallet2::get_seed(std::string& electrum_words) return memcmp(second.data,get_account().get_keys().m_view_secret_key.data, sizeof(crypto::secret_key)) == 0; } +/*! + * \brief Sets the seed language + */ +void wallet2::set_seed_language(const std::string &language) +{ + seed_language = language; +} //---------------------------------------------------------------------------------------------------- void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_t height) { diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 90918677e..afa42c2d3 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -152,7 +152,10 @@ namespace tools void callback(i_wallet2_callback* callback) { m_callback = callback; } bool get_seed(std::string& electrum_words); - + /*! + * \brief Sets the seed language + */ + void set_seed_language(const std::string &language); void refresh(); void refresh(uint64_t start_height, size_t & blocks_fetched); void refresh(uint64_t start_height, size_t & blocks_fetched, bool& received_money); @@ -236,6 +239,7 @@ namespace tools i_wallet2_callback* m_callback; bool m_testnet; + std::string seed_language; }; } BOOST_CLASS_VERSION(tools::wallet2, 7) |