diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-03-25 08:27:42 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-03-25 08:27:42 +0200 |
| commit | 40b8a5f327c9c7e79f436e3fd007995a6a439d04 (patch) | |
| tree | 0e4c9a35e9bbfcffcca4631d944031d0fbc7efb4 /src/simplewallet/simplewallet.h | |
| parent | Merge pull request #749 (diff) | |
| parent | wallet: add a --generate-from-json flag (diff) | |
| download | monero-40b8a5f327c9c7e79f436e3fd007995a6a439d04.tar.xz | |
Merge pull request #756
a2e378b wallet: add a --generate-from-json flag (moneromooo-monero)
Diffstat (limited to 'src/simplewallet/simplewallet.h')
| -rw-r--r-- | src/simplewallet/simplewallet.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index d1617dbf4..7dadb8536 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -69,6 +69,7 @@ namespace cryptonote bool run(); void stop(); void interrupt(); + bool generate_from_json(const boost::program_options::variables_map& vm, std::string &wallet_file, std::string &password); //wallet *create_wallet(); bool process_command(const std::vector<std::string> &args); @@ -221,6 +222,7 @@ namespace cryptonote std::string m_generate_new; std::string m_generate_from_view_key; std::string m_generate_from_keys; + std::string m_generate_from_json; std::string m_import_path; std::string m_electrum_seed; // electrum-style seed parameter |