diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-06-30 17:36:31 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-12-17 16:12:06 +0000 |
| commit | fff871a455a7829d2ccbceb04306365b30bd641e (patch) | |
| tree | 33d5e595b94075d7e3625a795186c83b0c3119f1 /src/wallet | |
| parent | wallet2: allow empty wallet filename to avoid saving data (diff) | |
| download | monero-fff871a455a7829d2ccbceb04306365b30bd641e.tar.xz | |
gen_multisig: generates multisig wallets if participants trust each other
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet_args.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet_args.h | 1 | ||||
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index a497f3242..d57d538ea 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -8108,7 +8108,6 @@ size_t wallet2::import_multisig(std::vector<std::vector<tools::wallet2::multisig break; } - MFATAL("import_multisig: updating from import"); for (size_t n = 0; n < n_outputs && n < m_transfers.size(); ++n) { update_multisig_rescan_info(k, info, n); @@ -8118,7 +8117,6 @@ size_t wallet2::import_multisig(std::vector<std::vector<tools::wallet2::multisig m_multisig_rescan_info = &info; try { - MFATAL("import_multisig: refreshing"); refresh(); } catch (...) {} diff --git a/src/wallet/wallet_args.cpp b/src/wallet/wallet_args.cpp index 91162c4bc..2273f14ad 100644 --- a/src/wallet/wallet_args.cpp +++ b/src/wallet/wallet_args.cpp @@ -85,6 +85,7 @@ namespace wallet_args boost::optional<boost::program_options::variables_map> main( int argc, char** argv, const char* const usage, + const char* const notice, boost::program_options::options_description desc_params, const boost::program_options::positional_options_description& positional_options, const std::function<void(const std::string&, bool)> &print, @@ -179,6 +180,9 @@ namespace wallet_args mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); } + if (notice) + Print(print) << notice << ENDL; + if (!command_line::is_arg_defaulted(vm, arg_max_concurrency)) tools::set_max_concurrency(command_line::get_arg(vm, arg_max_concurrency)); diff --git a/src/wallet/wallet_args.h b/src/wallet/wallet_args.h index 8974098ad..212958988 100644 --- a/src/wallet/wallet_args.h +++ b/src/wallet/wallet_args.h @@ -48,6 +48,7 @@ namespace wallet_args boost::optional<boost::program_options::variables_map> main( int argc, char** argv, const char* const usage, + const char* const notice, boost::program_options::options_description desc_params, const boost::program_options::positional_options_description& positional_options, const std::function<void(const std::string&, bool)> &print, diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index ab911d0ef..aa521c9aa 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -2361,6 +2361,7 @@ int main(int argc, char** argv) { const auto vm = wallet_args::main( argc, argv, "monero-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>|--wallet-dir=<directory>] [--rpc-bind-port=<port>]", + tools::wallet_rpc_server::tr("This is the RPC monero wallet. It needs to connect to a monero\ndaemon to work correctly."), desc_params, po::positional_options_description(), [](const std::string &s, bool emphasis){ epee::set_console_color(emphasis ? epee::console_color_white : epee::console_color_default, true); std::cout << s << std::endl; if (emphasis) epee::reset_console_color(); }, |