monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 03:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet2: do not assume imported outputs must be non empty

Browse source
This commit is contained in:
moneromooo-monero 2022-08-07 15:19:32 +00:00
parent 67b6d6ae2c
commit 692f1d4e3d
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View file

@ -6606,7 +6606,7 @@ bool wallet2::sign_tx(unsigned_tx_set &exported_txs, std::vector<wallet2::pendin
{ {
if (!exported_txs.new_transfers.second.empty()) if (!exported_txs.new_transfers.second.empty())
import_outputs(exported_txs.new_transfers); import_outputs(exported_txs.new_transfers);
else else if (exported_txs.transfers.second.empty())
import_outputs(exported_txs.transfers); import_outputs(exported_txs.transfers);
// sign the transactions // sign the transactions
@ -13395,7 +13395,7 @@ size_t wallet2::import_outputs_from_str(const std::string &outputs_st)
outputs.second = {}; outputs.second = {};
} }
imported_outputs = new_outputs.second.empty() ? import_outputs(outputs) : import_outputs(new_outputs); imported_outputs = !new_outputs.second.empty() ? import_outputs(new_outputs) : !outputs.second.empty() ? import_outputs(outputs) : 0;
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {