monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5808

Browse source 
5a91b83 simplewallet: add a few missing settings help text (stoffu)
ae7bf37 simplewallet: fix arg indexing bug in set_device_name (stoffu)
This commit is contained in:
luigi1111 2019-08-21 15:41:42 -05:00
commit d8244eb39c
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/simplewallet/simplewallet.cpp
View file

@ -2695,7 +2695,7 @@ bool simple_wallet::set_device_name(const std::vector<std::string> &args/* = std
return true; return true;
} }
m_wallet->device_name(args[0]); m_wallet->device_name(args[1]);
bool r = false; bool r = false;
try { try {
r = m_wallet->reconnect_device(); r = m_wallet->reconnect_device();
@ -2890,6 +2890,8 @@ simple_wallet::simple_wallet()
" Whether to warn if there is transaction backlog.\n " " Whether to warn if there is transaction backlog.\n "
"confirm-backlog-threshold [n]\n " "confirm-backlog-threshold [n]\n "
" Set a threshold for confirm-backlog to only warn if the transaction backlog is greater than n blocks.\n " " Set a threshold for confirm-backlog to only warn if the transaction backlog is greater than n blocks.\n "
"confirm-export-overwrite <1|0>\n "
" Whether to warn if the file to be exported already exists.\n "
"refresh-from-block-height [n]\n " "refresh-from-block-height [n]\n "
" Set the height before which to ignore blocks.\n " " Set the height before which to ignore blocks.\n "
"auto-low-priority <1|0>\n " "auto-low-priority <1|0>\n "
@ -2902,7 +2904,15 @@ simple_wallet::simple_wallet()
" Set the lookahead sizes for the subaddress hash table.\n " " Set the lookahead sizes for the subaddress hash table.\n "
" Set this if you are not sure whether you will spend on a key reusing Monero fork later.\n " " Set this if you are not sure whether you will spend on a key reusing Monero fork later.\n "
"segregation-height <n>\n " "segregation-height <n>\n "
" Set to the height of a key reusing fork you want to use, 0 to use default.")); " Set to the height of a key reusing fork you want to use, 0 to use default.\n "
"ignore-fractional-outputs <1|0>\n "
" Whether to ignore fractional outputs that result in net loss when spending due to fee.\n "
"track-uses <1|0>\n "
" Whether to keep track of owned outputs uses.\n "
"setup-background-mining <1|0>\n "
" Whether to enable background mining. Set this to support the network and to get a chance to receive new monero.\n "
"device-name <device_name[:device_spec]>\n "
" Device name for hardware wallet."));
m_cmd_binder.set_handler("encrypted_seed", m_cmd_binder.set_handler("encrypted_seed",
boost::bind(&simple_wallet::encrypted_seed, this, _1), boost::bind(&simple_wallet::encrypted_seed, this, _1),
tr("Display the encrypted Electrum-style mnemonic seed.")); tr("Display the encrypted Electrum-style mnemonic seed."));
@ -3266,8 +3276,8 @@ bool simple_wallet::set_variable(const std::vector<std::string> &args)
success_msg_writer() << "segregation-height = " << m_wallet->segregation_height(); success_msg_writer() << "segregation-height = " << m_wallet->segregation_height();
success_msg_writer() << "ignore-fractional-outputs = " << m_wallet->ignore_fractional_outputs(); success_msg_writer() << "ignore-fractional-outputs = " << m_wallet->ignore_fractional_outputs();
success_msg_writer() << "track-uses = " << m_wallet->track_uses(); success_msg_writer() << "track-uses = " << m_wallet->track_uses();
success_msg_writer() << "setup-background-mining = " << setup_background_mining_string + tr(" (set this to support the network and to get a chance to receive new monero)"); success_msg_writer() << "setup-background-mining = " << setup_background_mining_string;
success_msg_writer() << "device_name = " << m_wallet->device_name(); success_msg_writer() << "device-name = " << m_wallet->device_name();
return true; return true;
} }
else else