rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 01:12:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4818

Browse source 
ba2055a2 api/wallet: fix compile errors made in #4720 (stoffu)
This commit is contained in:
Riccardo Spagni 2018-11-07 14:34:41 +02:00
commit 3c83e3a63b
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wallet/api/wallet.cpp
View file

@ -507,7 +507,7 @@ bool WalletImpl::createWatchOnly(const std::string &path, const std::string &pas
auto key_images = m_wallet->export_key_images(); auto key_images = m_wallet->export_key_images();
uint64_t spent = 0; uint64_t spent = 0;
uint64_t unspent = 0; uint64_t unspent = 0;
view_wallet->import_key_images(key_images,spent,unspent,false); view_wallet->import_key_images(key_images.second, key_images.first, spent, unspent, false);
clearStatus(); clearStatus();
} catch (const std::exception &e) { } catch (const std::exception &e) {
LOG_ERROR("Error creating view only wallet: " << e.what()); LOG_ERROR("Error creating view only wallet: " << e.what());
@ -1051,8 +1051,8 @@ UnsignedTransaction *WalletImpl::loadUnsignedTx(const std::string &unsigned_file
// Check tx data and construct confirmation message // Check tx data and construct confirmation message
std::string extra_message; std::string extra_message;
if (!transaction->m_unsigned_tx_set.transfers.empty()) if (!transaction->m_unsigned_tx_set.transfers.second.empty())
extra_message = (boost::format("%u outputs to import. ") % (unsigned)transaction->m_unsigned_tx_set.transfers.size()).str(); extra_message = (boost::format("%u outputs to import. ") % (unsigned)transaction->m_unsigned_tx_set.transfers.second.size()).str();
transaction->checkLoadedTx([&transaction](){return transaction->m_unsigned_tx_set.txes.size();}, [&transaction](size_t n)->const tools::wallet2::tx_construction_data&{return transaction->m_unsigned_tx_set.txes[n];}, extra_message); transaction->checkLoadedTx([&transaction](){return transaction->m_unsigned_tx_set.txes.size();}, [&transaction](size_t n)->const tools::wallet2::tx_construction_data&{return transaction->m_unsigned_tx_set.txes[n];}, extra_message);
setStatus(transaction->status(), transaction->errorString()); setStatus(transaction->status(), transaction->errorString());