dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add "seed" option to CLI (#1772)

Browse source 
Supported in wallet_change_seed & wallet_create
This commit is contained in:
Sergey Kroshnin 2019-02-24 20:56:25 +03:00 • committed by GitHub
commit 3da9b480a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

50
nano/node/cli.cpp
View file

@ -53,6 +53,7 @@ void nano::add_node_options (boost::program_options::options_description & descr
("account", boost::program_options::value<std::string> (), "Defines <account> for other commands") ("account", boost::program_options::value<std::string> (), "Defines <account> for other commands")
("file", boost::program_options::value<std::string> (), "Defines <file> for other commands") ("file", boost::program_options::value<std::string> (), "Defines <file> for other commands")
("key", boost::program_options::value<std::string> (), "Defines the <key> for other commands, hex") ("key", boost::program_options::value<std::string> (), "Defines the <key> for other commands, hex")
("seed", boost::program_options::value<std::string> (), "Defines the <seed> for other commands, hex")
("password", boost::program_options::value<std::string> (), "Defines <password> for other commands") ("password", boost::program_options::value<std::string> (), "Defines <password> for other commands")
("wallet", boost::program_options::value<std::string> (), "Defines <wallet> for other commands") ("wallet", boost::program_options::value<std::string> (), "Defines <wallet> for other commands")
("force", boost::program_options::value<bool>(), "Bool to force command if allowed"); ("force", boost::program_options::value<bool>(), "Bool to force command if allowed");
@ -424,7 +425,7 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
} }
else if (vm.count ("wallet_change_seed")) else if (vm.count ("wallet_change_seed"))
{ {
if (vm.count ("wallet") == 1 && vm.count ("key") == 1) if (vm.count ("wallet") == 1 && (vm.count ("seed") == 1 || vm.count ("key") == 1))
{ {
nano::uint256_union wallet_id; nano::uint256_union wallet_id;
if (!wallet_id.decode_hex (vm["wallet"].as<std::string> ())) if (!wallet_id.decode_hex (vm["wallet"].as<std::string> ()))
@ -441,16 +442,24 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
auto transaction (wallet->wallets.tx_begin_write ()); auto transaction (wallet->wallets.tx_begin_write ());
if (!wallet->enter_password (transaction, password)) if (!wallet->enter_password (transaction, password))
{ {
nano::raw_key key; nano::raw_key seed;
if (!key.data.decode_hex (vm["key"].as<std::string> ())) if (vm.count ("seed"))
{
if (seed.data.decode_hex (vm["seed"].as<std::string> ()))
{
std::cerr << "Invalid seed\n";
ec = nano::error_cli::invalid_arguments;
}
}
else if (seed.data.decode_hex (vm["key"].as<std::string> ()))
{
std::cerr << "Invalid key seed\n";
ec = nano::error_cli::invalid_arguments;
}
if (!ec)
{ {
std::cout << "Changing seed and caching work. Please wait..." << std::endl; std::cout << "Changing seed and caching work. Please wait..." << std::endl;
wallet->change_seed (transaction, key); wallet->change_seed (transaction, seed);
}
else
{
std::cerr << "Invalid key\n";
ec = nano::error_cli::invalid_arguments;
} }
} }
else else
@ -473,24 +482,37 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
} }
else else
{ {
std::cerr << "wallet_change_seed command requires one <wallet> option and one <key> option and optionally one <password> option\n"; std::cerr << "wallet_change_seed command requires one <wallet> option and one <seed> option and optionally one <password> option\n";
ec = nano::error_cli::invalid_arguments; ec = nano::error_cli::invalid_arguments;
} }
} }
else if (vm.count ("wallet_create")) else if (vm.count ("wallet_create"))
{ {
nano::raw_key seed_key; nano::raw_key seed_key;
if (vm.count ("key") == 1) if (vm.count ("seed") == 1)
{
if (seed_key.data.decode_hex (vm["seed"].as<std::string> ()))
{
std::cerr << "Invalid seed\n";
ec = nano::error_cli::invalid_arguments;
}
}
else if (vm.count ("seed") > 1)
{
std::cerr << "wallet_create command allows one optional <seed> parameter\n";
ec = nano::error_cli::invalid_arguments;
}
else if (vm.count ("key") == 1)
{ {
if (seed_key.data.decode_hex (vm["key"].as<std::string> ())) if (seed_key.data.decode_hex (vm["key"].as<std::string> ()))
{ {
std::cerr << "Invalid key\n"; std::cerr << "Invalid seed key\n";
ec = nano::error_cli::invalid_arguments; ec = nano::error_cli::invalid_arguments;
} }
} }
else if (vm.count ("key") > 1) else if (vm.count ("key") > 1)
{ {
std::cerr << "wallet_create command allows one optional <key> parameter\n"; std::cerr << "wallet_create command allows one optional <key> seed parameter\n";
ec = nano::error_cli::invalid_arguments; ec = nano::error_cli::invalid_arguments;
} }
if (!ec) if (!ec)
@ -511,7 +533,7 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
ec = nano::error_cli::invalid_arguments; ec = nano::error_cli::invalid_arguments;
} }
} }
if (vm.count ("key")) if (vm.count ("seed") || vm.count ("key"))
{ {
auto transaction (wallet->wallets.tx_begin_write ()); auto transaction (wallet->wallets.tx_begin_write ());
wallet->change_seed (transaction, seed_key); wallet->change_seed (transaction, seed_key);