diff options
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 6 | ||||
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 5cebc7c23..9b3e7e8b4 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -390,6 +390,11 @@ std::unique_ptr<tools::wallet2> make_basic(const boost::program_options::variabl { auto parsed = tools::login::parse( command_line::get_arg(vm, opts.daemon_login), false, [password_prompter](bool verify) { + if (!password_prompter) + { + MERROR("Password needed without prompt function"); + return boost::optional<tools::password_container>(); + } return password_prompter("Daemon client password", verify); } ); @@ -3524,6 +3529,7 @@ void wallet2::detach_blockchain(uint64_t height, std::map<std::pair<uint64_t, ui THROW_WALLET_EXCEPTION_IF(it_pk == m_pub_keys.end(), error::wallet_internal_error, "public key not found"); m_pub_keys.erase(it_pk); } + transfers_detached = std::distance(it, m_transfers.end()); m_transfers.erase(it, m_transfers.end()); size_t blocks_detached = m_blockchain.size() - height; diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index c128210c4..ec21b2897 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -288,7 +288,7 @@ namespace tools if (setup == tools::wallet2::BackgroundMiningMaybe) { MINFO("The daemon is not set up to background mine."); - MINFO("With background mining enabled, the daemon will mine when idle and not on batttery."); + MINFO("With background mining enabled, the daemon will mine when idle and not on battery."); MINFO("Enabling this supports the network you are using, and makes you eligible for receiving new monero"); MINFO("Set setup-background-mining to 1 in monero-wallet-cli to change."); return; @@ -307,7 +307,7 @@ namespace tools return; } - MINFO("Background mining enabled. The daemon will mine when idle and not on batttery."); + MINFO("Background mining enabled. The daemon will mine when idle and not on battery."); } //------------------------------------------------------------------------------------------------------------------------------ bool wallet_rpc_server::not_open(epee::json_rpc::error& er) |