diff options
author | Riccardo Spagni <ric@spagni.net> | 2018-09-14 13:05:43 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2018-09-14 13:05:43 +0200 |
commit | dd2fc3afe3bfb3603125caba15eea0154b7dca30 (patch) | |
tree | f588394a0075dbc22352f91bde8f52425ccd6bfb /src/wallet/wallet2.h | |
parent | Merge pull request #4331 (diff) | |
parent | wallet2: factor the creation of a new wallet keys file (diff) | |
download | monero-dd2fc3afe3bfb3603125caba15eea0154b7dca30.tar.xz |
Merge pull request #4332
20171746 wallet2: factor the creation of a new wallet keys file (moneromooo-monero)
be6acfd5 wallet2: factor new blockchain setup (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r-- | src/wallet/wallet2.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 0347092c0..02982296e 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -544,8 +544,9 @@ namespace tools * \param wallet_ Name of wallet file * \param password Password of wallet file * \param device_name name of HW to use + * \param create_address_file Whether to create an address file */ - void restore(const std::string& wallet_, const epee::wipeable_string& password, const std::string &device_name); + void restore(const std::string& wallet_, const epee::wipeable_string& password, const std::string &device_name, bool create_address_file); /*! * \brief Creates a multisig wallet @@ -1235,6 +1236,9 @@ namespace tools void cache_tx_data(const cryptonote::transaction& tx, const crypto::hash &txid, tx_cache_data &tx_cache_data) const; + void setup_new_blockchain(); + void create_keys_file(const std::string &wallet_, bool watch_only, const epee::wipeable_string &password, bool create_address_file); + cryptonote::account_base m_account; boost::optional<epee::net_utils::http::login> m_daemon_login; std::string m_daemon_address; |