diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-18 17:31:35 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-18 17:31:35 +0200 |
| commit | b174527f1d7c9f352da3c849d62cc12ec1e0b92d (patch) | |
| tree | 289160042cf83563bf572cfbfc3ac55bbf507dbc /src/wallet/wallet2.h | |
| parent | Merge pull request #4299 (diff) | |
| parent | api/wallet: properly disable key encryption (diff) | |
| download | monero-b174527f1d7c9f352da3c849d62cc12ec1e0b92d.tar.xz | |
Merge pull request #4302
ba8dd347 api/wallet: properly disable key encryption (stoffu)
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 2f833c679..c30ca1d85 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -190,7 +190,7 @@ namespace tools static bool verify_password(const std::string& keys_file_name, const epee::wipeable_string& password, bool no_spend_key, hw::device &hwdev, uint64_t kdf_rounds); - wallet2(cryptonote::network_type nettype = cryptonote::MAINNET, uint64_t kdf_rounds = 1); + wallet2(cryptonote::network_type nettype = cryptonote::MAINNET, uint64_t kdf_rounds = 1, bool unattended = false); ~wallet2(); struct multisig_info @@ -639,7 +639,7 @@ namespace tools bool explicit_refresh_from_block_height() const {return m_explicit_refresh_from_block_height;} bool deinit(); - bool init(bool unatteded, std::string daemon_address = "http://localhost:8080", + bool init(std::string daemon_address = "http://localhost:8080", boost::optional<epee::net_utils::http::login> daemon_login = boost::none, uint64_t upper_transaction_weight_limit = 0, bool ssl = false, bool trusted_daemon = false); void stop() { m_run.store(false, std::memory_order_relaxed); } |