diff options
| author | monero-project <sempre.amaro@gmail.com> | 2014-06-12 19:14:25 -0400 |
|---|---|---|
| committer | monero-project <sempre.amaro@gmail.com> | 2014-06-12 19:14:25 -0400 |
| commit | c3203c86c671d41ed4a07231c8a5054124d2e7d2 (patch) | |
| tree | 06a7aceb34d1e53ca4bfd28d3fbc13b5ef0d8a30 /src/simplewallet/simplewallet.h | |
| parent | new error code for rpc (diff) | |
| parent | allow two-random-numbers wallet generation (but not as default) (diff) | |
| download | monero-c3203c86c671d41ed4a07231c8a5054124d2e7d2.tar.xz | |
Merge pull request #34 from tewinget/master
Add electrum-seed wallet backup/recovery
Diffstat (limited to 'src/simplewallet/simplewallet.h')
| -rw-r--r-- | src/simplewallet/simplewallet.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index 3dcaaeaa0..006cdd08e 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -13,6 +13,7 @@ #include "wallet/wallet2.h" #include "console_handler.h" #include "password_container.h" +#include "crypto/crypto.h" // for definition of crypto::secret_key namespace cryptonote @@ -39,7 +40,7 @@ namespace cryptonote bool run_console_handler(); - bool new_wallet(const std::string &wallet_file, const std::string& password); + bool new_wallet(const std::string &wallet_file, const std::string& password, const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false, bool two_random = false); bool open_wallet(const std::string &wallet_file, const std::string& password); bool close_wallet(); @@ -125,6 +126,12 @@ namespace cryptonote std::string m_generate_new; std::string m_import_path; + std::string m_electrum_seed; // electrum-style seed parameter + + crypto::secret_key m_recovery_key; // recovery key (used as random for wallet gen) + bool m_restore_deterministic_wallet; // recover flag + bool m_non_deterministic; // old 2-random generation + std::string m_daemon_address; std::string m_daemon_host; int m_daemon_port; |