diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-04-01 20:56:52 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-04-01 20:56:52 +0200 |
| commit | b6726aaa6ce8c1aa55bd8a38ef2ea93c01ab3304 (patch) | |
| tree | 9441089cf331148648dccd8092bc71a926ed956b /src/wallet/wallet2.h | |
| parent | Merge pull request #5318 (diff) | |
| parent | wallet_rpc_server: error out on getting the spend key from a hot wallet (diff) | |
| download | monero-b6726aaa6ce8c1aa55bd8a38ef2ea93c01ab3304.tar.xz | |
Merge pull request #5319
f825055d wallet_rpc_server: error out on getting the spend key from a hot wallet (moneromooo-monero)
67aa4adc wallet_rpc_server: add a set_daemon RPC (moneromooo-monero)
705acbac wallet2: init some variables to default values if loading old wallets (moneromooo-monero)
f82bc29e wallet_rpc_server: always fill out subaddr_indices in get_transfers (moneromooo-monero)
01efdc6a wallet_rpc_server: set confirmations to 0 for pending/pool txes (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 5a67c20d0..2eb7de94a 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -691,6 +691,12 @@ namespace tools const std::pair<std::string, std::string> &private_key_and_certificate_path = {}, const std::list<std::string> &allowed_certificates = {}, const std::vector<std::vector<uint8_t>> &allowed_fingerprints = {}, bool allow_any_cert = false); + 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_support_t ssl_support = epee::net_utils::ssl_support_t::e_ssl_support_autodetect, + const std::pair<std::string, std::string> &private_key_and_certificate_path = {}, + const std::list<std::string> &allowed_certificates = {}, const std::vector<std::vector<uint8_t>> &allowed_fingerprints = {}, + bool allow_any_cert = false); void stop() { m_run.store(false, std::memory_order_relaxed); m_message_store.stop(); } |