aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/api/wallet.cpp
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2022-09-09 12:57:51 -0500
committerluigi1111 <luigi1111w@gmail.com>2022-09-09 12:57:51 -0500
commitaf4f97bf66282bb2af25b5577d9bcba4d00b00b0 (patch)
treefd56eafb5191416b67c55b6479056cd1423c1ad7 /src/wallet/api/wallet.cpp
parent89f3d461204a416c82bff6da6a9cc9c3602132dc (diff)
parente29b2e999737b76bbddd844858168a145916ebe0 (diff)
downloadmonzero-core-af4f97bf66282bb2af25b5577d9bcba4d00b00b0.tar.gz
monzero-core-af4f97bf66282bb2af25b5577d9bcba4d00b00b0.tar.xz
monzero-core-af4f97bf66282bb2af25b5577d9bcba4d00b00b0.zip
Merge pull request #8555
e29b2e9 wallet2: ensure imported outputs subaddresses are created (moneromooo-monero) 1d3657a wallet2: better test on whether to allow output import (moneromooo-monero) 0cbf557 allow exporting outputs in chunks (moneromooo-monero) b03d709 wallet2: fixes for export/import output flow (j-berman) 4b7eb57 wallet2: do not assume imported outputs must be non empty (moneromooo-monero) 5b98beb wallet2: prevent importing outputs in a hot wallet (moneromooo-monero) 0de1571 wallet2: fix missing subaddress indices in 'light' exported outputs (moneromooo-monero)
Diffstat (limited to 'src/wallet/api/wallet.cpp')
-rw-r--r--src/wallet/api/wallet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 1ee2e20b6..807dba33b 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -1146,8 +1146,8 @@ UnsignedTransaction *WalletImpl::loadUnsignedTx(const std::string &unsigned_file
// Check tx data and construct confirmation message
std::string extra_message;
- if (!transaction->m_unsigned_tx_set.transfers.second.empty())
- extra_message = (boost::format("%u outputs to import. ") % (unsigned)transaction->m_unsigned_tx_set.transfers.second.size()).str();
+ if (!std::get<2>(transaction->m_unsigned_tx_set.transfers).empty())
+ extra_message = (boost::format("%u outputs to import. ") % (unsigned)std::get<2>(transaction->m_unsigned_tx_set.transfers).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);
setStatus(transaction->status(), transaction->errorString());