Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-22 20:19:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9160

Browse source 
c50ade5 Daemon-specific proxy for the wallet-rpc. (0xFFFC0000)
This commit is contained in:
luigi1111 2024-02-24 10:11:51 -05:00
commit 72d87cd10a
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
5 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/wallet/wallet2.h
View file

@ -963,6 +963,12 @@ private:
std::string path() const;
/*!
* \brief has_proxy_option Check the global proxy (--proxy) has been defined or not.
* \return returns bool representing the global proxy (--proxy).
*/
bool has_proxy_option() const;
/*!
* \brief verifies given password is correct for default wallet keys file
*/
@ -993,7 +999,8 @@ private:
epee::net_utils::ssl_options_t ssl_options = epee::net_utils::ssl_support_t::e_ssl_support_autodetect);
bool set_daemon(std::string daemon_address = "http://localhost:8080",
boost::optional<epee::net_utils::http::login> daemon_login = boost::none, bool trusted_daemon = true,
epee::net_utils::ssl_options_t ssl_options = epee::net_utils::ssl_support_t::e_ssl_support_autodetect);
epee::net_utils::ssl_options_t ssl_options = epee::net_utils::ssl_support_t::e_ssl_support_autodetect,
const std::string &proxy = "");
bool set_proxy(const std::string &address);
void stop() { m_run.store(false, std::memory_order_relaxed); m_message_store.stop(); }
@ -1772,6 +1779,7 @@ private:
cryptonote::account_base m_account;
boost::optional<epee::net_utils::http::login> m_daemon_login;
std::string m_daemon_address;
std::string m_proxy;
std::string m_wallet_file;
std::string m_keys_file;
std::string m_mms_file;