mirror of
https://github.com/monero-project/monero.git
synced 2025-08-08 16:02:18 -04:00
Merge pull request #8724
d2a591d
wallet, simplewallet: Drop support for mine-to-use RPC system (Jeffrey Ryan)
This commit is contained in:
commit
1c9686cb45
13 changed files with 32 additions and 1022 deletions
|
@ -4517,7 +4517,6 @@ public:
|
|||
|
||||
const auto arg_wallet_file = wallet_args::arg_wallet_file();
|
||||
const auto arg_from_json = wallet_args::arg_generate_from_json();
|
||||
const auto arg_rpc_client_secret_key = wallet_args::arg_rpc_client_secret_key();
|
||||
const auto arg_password_file = wallet_args::arg_password_file();
|
||||
|
||||
const auto wallet_file = command_line::get_arg(vm, arg_wallet_file);
|
||||
|
@ -4575,17 +4574,6 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!command_line::is_arg_defaulted(vm, arg_rpc_client_secret_key))
|
||||
{
|
||||
crypto::secret_key client_secret_key;
|
||||
if (!epee::string_tools::hex_to_pod(command_line::get_arg(vm, arg_rpc_client_secret_key), client_secret_key))
|
||||
{
|
||||
MERROR(arg_rpc_client_secret_key.name << ": RPC client secret key should be 32 byte in hex format");
|
||||
return false;
|
||||
}
|
||||
wal->set_rpc_client_secret_key(client_secret_key);
|
||||
}
|
||||
|
||||
bool quit = false;
|
||||
tools::signal_handler::install([&wal, &quit](int) {
|
||||
assert(wal);
|
||||
|
@ -4692,7 +4680,6 @@ int main(int argc, char** argv) {
|
|||
|
||||
const auto arg_wallet_file = wallet_args::arg_wallet_file();
|
||||
const auto arg_from_json = wallet_args::arg_generate_from_json();
|
||||
const auto arg_rpc_client_secret_key = wallet_args::arg_rpc_client_secret_key();
|
||||
|
||||
po::options_description hidden_options("Hidden");
|
||||
|
||||
|
@ -4706,7 +4693,6 @@ int main(int argc, char** argv) {
|
|||
command_line::add_arg(desc_params, arg_from_json);
|
||||
command_line::add_arg(desc_params, arg_wallet_dir);
|
||||
command_line::add_arg(desc_params, arg_prompt_for_password);
|
||||
command_line::add_arg(desc_params, arg_rpc_client_secret_key);
|
||||
command_line::add_arg(desc_params, arg_no_initial_sync);
|
||||
|
||||
daemonizer::init_options(hidden_options, desc_params);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue