diff options
| author | Jaquee <jaquee.monero@gmail.com> | 2017-08-04 22:34:13 +0200 |
|---|---|---|
| committer | Jaquee <jaquee.monero@gmail.com> | 2017-10-15 17:32:13 +0200 |
| commit | e2a276cbb5f76185c475cac91802bd4f4629abb5 (patch) | |
| tree | 7696d221cc70716a6210427606084626cada14e9 /src | |
| parent | add string_tools::validate_hex() (diff) | |
| download | monero-e2a276cbb5f76185c475cac91802bd4f4629abb5.tar.xz | |
wallet2: add ssl option to init()
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet2.cpp | 7 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index d451baa09..689694305 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -525,7 +525,7 @@ std::unique_ptr<wallet2> wallet2::make_dummy(const boost::program_options::varia } //---------------------------------------------------------------------------------------------------- -bool wallet2::init(std::string daemon_address, boost::optional<epee::net_utils::http::login> daemon_login, uint64_t upper_transaction_size_limit) +bool wallet2::init(std::string daemon_address, boost::optional<epee::net_utils::http::login> daemon_login, uint64_t upper_transaction_size_limit, bool ssl) { m_checkpoints.init_default_checkpoints(m_testnet); if(m_http_client.is_connected()) @@ -534,7 +534,10 @@ bool wallet2::init(std::string daemon_address, boost::optional<epee::net_utils:: m_upper_transaction_size_limit = upper_transaction_size_limit; m_daemon_address = std::move(daemon_address); m_daemon_login = std::move(daemon_login); - return m_http_client.set_server(get_daemon_address(), get_daemon_login()); + // When switching from light wallet to full wallet, we need to reset the height we got from lw node. + if(m_light_wallet) + m_local_bc_height = m_blockchain.size(); + return m_http_client.set_server(get_daemon_address(), get_daemon_login(), ssl); } //---------------------------------------------------------------------------------------------------- bool wallet2::is_deterministic() const diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index ff049552e..3c2330040 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -410,7 +410,7 @@ namespace tools // the minimum block size. bool deinit(); bool init(std::string daemon_address = "http://localhost:8080", - boost::optional<epee::net_utils::http::login> daemon_login = boost::none, uint64_t upper_transaction_size_limit = 0); + boost::optional<epee::net_utils::http::login> daemon_login = boost::none, uint64_t upper_transaction_size_limit = 0, bool ssl = false); void stop() { m_run.store(false, std::memory_order_relaxed); } |