Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

disable TOR by default for server-mode, fixed --disable-tor-relay which was not working for server mode

Browse source
This commit is contained in:
cryptozoidberg 2022-07-08 17:06:26 +02:00
parent 49dc47c8cf
commit e1acd4e4e6
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/qt-daemon/layout

@ -1 +1 @@
Subproject commit 22212b20250b918f713dc90e85dadc2700d23a6a
Subproject commit 14def6aef99d4f10e81990e2055a7cf490f2e797

13
src/simplewallet/simplewallet.cpp
View file

@ -56,7 +56,7 @@ namespace
const command_line::arg_descriptor<bool> arg_offline_mode ( "offline-mode", "Don't connect to daemon, work offline (for cold-signing process)");
const command_line::arg_descriptor<std::string> arg_scan_for_wallet ( "scan-for-wallet", "");
const command_line::arg_descriptor<std::string> arg_addr_to_compare ( "addr-to-compare", "");
const command_line::arg_descriptor<bool> arg_disable_tor_relay ( "disable-tor-relay", "Do PoS mining", false);
const command_line::arg_descriptor<bool> arg_disable_tor_relay ( "disable-tor-relay", "Disable TOR relay", false);
const command_line::arg_descriptor< std::vector<std::string> > arg_command ("command", "");
@ -2176,6 +2176,17 @@ int main(int argc, char* argv[])
LOG_PRINT_YELLOW("PoS reward will be sent to another address: " << arg_pos_mining_reward_address_str, LOG_LEVEL_0);
}
}
if (command_line::has_arg(vm, arg_disable_tor_relay))
{
wal.set_disable_tor_relay(command_line::get_arg(vm, arg_disable_tor_relay));
}
else
{
//disable TOR by default for server-mode, to avoid potential sporadic errors due to TOR connectivity fails
wal.set_disable_tor_relay(true);
}
tools::wallet_rpc_server wrpc(wal);
bool r = wrpc.init(vm);

1
src/wallet/wallet_rpc_server.cpp
View file

@ -143,6 +143,7 @@ namespace tools
{
m_wallet.set_miner_text_info(command_line::get_arg(vm, arg_miner_text_info));
}
return true;
}
//------------------------------------------------------------------------------------------------------------------------------